From dea1a28a698a2dd2618cd6a414918a4552ec1608 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 21 Apr 2016 12:53:44 +0200
Subject: [PATCH 01/15] purges simple_captcha

---
 Gemfile                                       |  1 -
 Gemfile.lock                                  |  3 -
 README.md                                     |  2 +-
 README_ES.md                                  |  2 +-
 app/assets/stylesheets/layout.scss            | 20 -------
 app/assets/stylesheets/print.css              |  2 -
 app/controllers/application_controller.rb     |  1 -
 .../concerns/commentable_actions.rb           |  4 +-
 app/controllers/debates_controller.rb         |  2 +-
 .../management/proposals_controller.rb        |  2 +-
 .../spending_proposals_controller.rb          |  4 +-
 .../organizations/registrations_controller.rb |  4 +-
 app/controllers/proposals_controller.rb       |  2 +-
 .../spending_proposals_controller.rb          |  4 +-
 .../users/registrations_controller.rb         |  5 +-
 app/models/debate.rb                          |  1 -
 app/models/proposal.rb                        |  1 -
 app/models/spending_proposal.rb               |  1 -
 app/models/user.rb                            |  1 -
 app/views/debates/_form.html.erb              |  4 --
 .../organizations/registrations/new.html.erb  |  3 -
 app/views/pages/faq.html.erb                  |  2 +-
 app/views/proposals/_form.html.erb            |  4 --
 app/views/simple_captcha/_simple_captcha.erb  |  8 ---
 app/views/spending_proposals/_form.html.erb   |  6 +-
 app/views/users/registrations/new.html.erb    |  2 -
 config/deploy/shared/secrets.yml.erb          |  2 -
 config/i18n-tasks.yml                         |  1 -
 config/initializers/simple_captcha.rb         | 37 ------------
 config/locales/en.yml                         |  9 ---
 config/locales/es.yml                         |  9 ---
 .../20160421090733_destroy_captcha_table.rb   |  5 ++
 db/schema.rb                                  |  9 ---
 spec/controllers/debates_controller_spec.rb   |  9 ---
 spec/features/debates_spec.rb                 | 48 ----------------
 spec/features/management/proposals_spec.rb    |  1 -
 .../management/spending_proposals_spec.rb     |  3 +-
 spec/features/organizations_spec.rb           |  1 -
 spec/features/proposals_spec.rb               | 56 -------------------
 spec/features/registration_form_spec.rb       |  1 -
 spec/features/spending_proposals_spec.rb      | 23 --------
 spec/features/tags_spec.rb                    |  4 --
 spec/features/users_auth_spec.rb              |  1 -
 spec/support/common_actions.rb                |  5 --
 44 files changed, 23 insertions(+), 292 deletions(-)
 delete mode 100644 app/views/simple_captcha/_simple_captcha.erb
 delete mode 100644 config/initializers/simple_captcha.rb
 create mode 100644 db/migrate/20160421090733_destroy_captcha_table.rb

diff --git a/Gemfile b/Gemfile
index 001eb4c38..7bfac1b15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,6 @@ gem 'responders'
 gem 'foundation-rails'
 gem 'foundation_rails_helper'
 gem 'acts_as_votable'
-gem 'simple_captcha2', require: 'simple_captcha'
 gem 'ckeditor', '~> 4.1.5'
 gem 'cancancan'
 gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e6b1aa80..8bc02c6ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -365,8 +365,6 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 2.4)
       wasabi (~> 3.4)
-    simple_captcha2 (0.4.0)
-      rails (>= 4.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -492,7 +490,6 @@ DEPENDENCIES
   rspec-rails (~> 3.3)
   sass-rails (~> 5.0, >= 5.0.4)
   savon
-  simple_captcha2
   social-share-button!
   spring
   spring-commands-rspec
diff --git a/README.md b/README.md
index e6181f38c..0ee254d3a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http
 
 ## Configuration for development and test environments
 
-Prerequisites: install git, ImageMagick, Ruby 2.2.3, bundler gem, ghostscript and PostgreSQL (>=9.4).
+Prerequisites: install git, Ruby 2.2.3, bundler gem, ghostscript and PostgreSQL (>=9.4).
 
 ```
 git clone https://github.com/consul/consul.git
diff --git a/README_ES.md b/README_ES.md
index e0392bc51..9ae368848 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -27,7 +27,7 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo
 
 ## Configuración para desarrollo y tests
 
-Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
+Prerequisitos: tener instalado git, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
 
 ```
 
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 475a0bfbe..030041769 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -746,26 +746,6 @@ form {
     line-height: $line-height;
     vertical-align: middle;
   }
-
-  .captcha {
-    border: 0;
-    padding: $line-height/2 0;
-
-    input {
-      margin-bottom: 0 !important;
-    }
-  }
-
-  .button.margin-top {
-    margin-top: $line-height;
-  }
-}
-
-.captcha {
-
-  label {
-    display: none;
-  }
 }
 
 // 07. Alerts
diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css
index 5297826c8..29096ae13 100644
--- a/app/assets/stylesheets/print.css
+++ b/app/assets/stylesheets/print.css
@@ -24,8 +24,6 @@ img.left { display: none !important; }
 
 .icon-proposals { display: none !important; }
 
-.captcha { display: none !important; }
-
 li.name  { display: none !important; }
 
 li.kind  { display: none !important; }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 640adf299..10a3c97b9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,6 @@
 require "application_responder"
 
 class ApplicationController < ActionController::Base
-  include SimpleCaptcha::ControllerHelpers
   include HasFilters
   include HasOrders
 
diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index 332d031a5..de2a2276a 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -38,7 +38,7 @@ module CommentableActions
     @resource = resource_model.new(strong_params)
     @resource.author = current_user
 
-    if @resource.save_with_captcha
+    if @resource.save
       track_event
       redirect_path = url_for(controller: controller_name, action: :show, id: @resource.id)
       redirect_to redirect_path, notice: t("flash.actions.create.#{resource_name.underscore}")
@@ -55,7 +55,7 @@ module CommentableActions
 
   def update
     resource.assign_attributes(strong_params)
-    if resource.save_with_captcha
+    if resource.save
       redirect_to resource, notice: t("flash.actions.update.#{resource_name.underscore}")
     else
       load_categories
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index b747cd903..40e198148 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -45,7 +45,7 @@ class DebatesController < ApplicationController
   private
 
     def debate_params
-      params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
+      params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service)
     end
 
     def resource_model
diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb
index 3f4284a06..7d3925e95 100644
--- a/app/controllers/management/proposals_controller.rb
+++ b/app/controllers/management/proposals_controller.rb
@@ -33,7 +33,7 @@ class Management::ProposalsController < Management::BaseController
     end
 
     def proposal_params
-      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
+      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service)
     end
 
     def resource_model
diff --git a/app/controllers/management/spending_proposals_controller.rb b/app/controllers/management/spending_proposals_controller.rb
index 49378ca63..ca723cccc 100644
--- a/app/controllers/management/spending_proposals_controller.rb
+++ b/app/controllers/management/spending_proposals_controller.rb
@@ -16,7 +16,7 @@ class Management::SpendingProposalsController < Management::BaseController
     @spending_proposal = SpendingProposal.new(spending_proposal_params)
     @spending_proposal.author = managed_user
 
-    if @spending_proposal.save_with_captcha
+    if @spending_proposal.save
       redirect_to management_spending_proposal_path(@spending_proposal), notice: t('flash.actions.create.notice', resource_name: t("activerecord.models.spending_proposal", count: 1))
     else
       render :new
@@ -45,7 +45,7 @@ class Management::SpendingProposalsController < Management::BaseController
     end
 
     def spending_proposal_params
-      params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :terms_of_service, :captcha, :captcha_key)
+      params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :terms_of_service)
     end
 
     def only_verified_users
diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index c0f69da33..b0b177f09 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -11,7 +11,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
 
   def create
     build_resource(sign_up_params)
-    if resource.valid_with_captcha?
+    if resource.valid?
       super do |user|
         # Removes unuseful "organization is invalid" error message
         user.errors.messages.delete(:organization)
@@ -29,7 +29,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
   private
 
     def sign_up_params
-      params.require(:user).permit(:email, :password, :phone_number, :password_confirmation, :captcha, :captcha_key, :terms_of_service, organization_attributes: [:name, :responsible_name])
+      params.require(:user).permit(:email, :password, :phone_number, :password_confirmation, :terms_of_service, organization_attributes: [:name, :responsible_name])
     end
 
 end
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 8567cda14..9153df449 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -56,7 +56,7 @@ class ProposalsController < ApplicationController
   private
 
     def proposal_params
-      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key, :geozone_id)
+      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :geozone_id)
     end
 
     def retired_params
diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index 9915b0b50..64172ed56 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -27,7 +27,7 @@ class SpendingProposalsController < ApplicationController
     @spending_proposal = SpendingProposal.new(spending_proposal_params)
     @spending_proposal.author = current_user
 
-    if @spending_proposal.save_with_captcha
+    if @spending_proposal.save
       notice = t('flash.actions.create.spending_proposal', activity: "<a href='#{user_path(current_user, filter: :spending_proposals)}'>#{t('layouts.header.my_activity_link')}</a>")
       redirect_to @spending_proposal, notice: notice, flash: { html_safe: true }
     else
@@ -49,7 +49,7 @@ class SpendingProposalsController < ApplicationController
   private
 
     def spending_proposal_params
-      params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :association_name, :terms_of_service, :captcha, :captcha_key)
+      params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :association_name, :terms_of_service)
     end
 
     def set_geozone_name
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 9d6530017..da9fc1372 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -9,7 +9,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
 
   def create
     build_resource(sign_up_params)
-    if resource.valid_with_captcha?
+    if resource.valid?
       super
     else
       render :new
@@ -58,8 +58,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
     def sign_up_params
       params[:user].delete(:redeemable_code) if params[:user].present? && params[:user][:redeemable_code].blank?
       params.require(:user).permit(:username, :email, :password,
-                                   :password_confirmation, :captcha,
-                                   :captcha_key, :terms_of_service, :locale,
+                                   :password_confirmation, :terms_of_service, :locale,
                                    :redeemable_code)
     end
 
diff --git a/app/models/debate.rb b/app/models/debate.rb
index cdae527f7..840b9c4b5 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -8,7 +8,6 @@ class Debate < ActiveRecord::Base
   include Searchable
   include Filterable
 
-  apply_simple_captcha
   acts_as_votable
   acts_as_paranoid column: :hidden_at
   include ActsAsParanoidAliases
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index e6071e052..d2b97f1c5 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -7,7 +7,6 @@ class Proposal < ActiveRecord::Base
   include Searchable
   include Filterable
 
-  apply_simple_captcha
   acts_as_votable
   acts_as_paranoid column: :hidden_at
   include ActsAsParanoidAliases
diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb
index 3a13935c4..a2c143336 100644
--- a/app/models/spending_proposal.rb
+++ b/app/models/spending_proposal.rb
@@ -4,7 +4,6 @@ class SpendingProposal < ActiveRecord::Base
   include Taggable
   include Searchable
 
-  apply_simple_captcha
   acts_as_votable
 
   belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
diff --git a/app/models/user.rb b/app/models/user.rb
index ea889ac57..7da80b6fb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,7 +2,6 @@ class User < ActiveRecord::Base
 
   include Verification
 
-  apply_simple_captcha
   devise :database_authenticatable, :registerable, :confirmable,
          :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :async
 
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index be5c92306..2e19b5d2b 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -32,10 +32,6 @@
       <% end %>
     </div>
 
-    <div class="small-12 column">
-      <%= f.simple_captcha input_html: { required: false } %>
-    </div>
-
     <div class="actions small-12 column">
       <%= f.submit(class: "button", value: t("debates.#{action_name}.form.submit_button")) %>
     </div>
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 8d39d0199..01483fda5 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -24,9 +24,6 @@
                            label: t("devise_views.organizations.registrations.new.password_confirmation_label"),
                            placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %>
 
-      <%= f.simple_captcha input_html: {required: false} %>
-
-
       <%= f.label :terms_of_service do %>
         <%= f.check_box :terms_of_service, title: t('devise_views.users.registrations.new.terms_title'), label: false %>
         <span class="checkbox">
diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb
index 0dcd09a68..7f82147b6 100644
--- a/app/views/pages/faq.html.erb
+++ b/app/views/pages/faq.html.erb
@@ -71,7 +71,7 @@
 
     <h2 id="5">¿Cómo creo y verifico mi cuenta?</h2>
     <ul>
-      <li>Lo primero es crear una cuenta básica. Para ello hacemos clic en el enlace <a href="https://decide.madrid.es/users/sign_up">Registrarse</a> y rellenamos los datos que nos piden. Es un requisito marcar la casilla de aceptación de las condiciones de uso, y rellenar correctamente el captcha (en la parte inferior del formulario se nos presenta una imagen con unas letras deformadas que tendremos que introducir en la casilla inferior como medida de seguridad; ten en cuenta la diferencia entre mayúsculas y minúsculas). Al crear una cuenta nos llegará un correo electrónico a la dirección que hayamos especificado, y tendremos que hacer click en el enlace que contiene (el enlace que pone "Confirmar mi cuenta") para terminar de crear la cuenta.</li>
+      <li>Lo primero es crear una cuenta básica. Para ello hacemos clic en el enlace <a href="https://decide.madrid.es/users/sign_up">Registrarse</a> y rellenamos los datos que nos piden. Es un requisito marcar la casilla de aceptación de las condiciones de uso. Al crear una cuenta nos llegará un correo electrónico a la dirección que hayamos especificado, y tendremos que hacer click en el enlace que contiene (el enlace que pone "Confirmar mi cuenta") para terminar de crear la cuenta.</li>
       <li>Una vez creada la cuenta básica, y tras <a href="https://decide.madrid.es/users/sign_in">entrar</a> con nuestro correo y contraseña, el sistema nos dará la opción de realizar una verificación básica de la misma. Tanto este paso como el siguiente se pueden realizar presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank" title="(se abre en ventana nueva)">26 Oficinas de Atención al Ciudadano</a> que hay por todo Madrid. Si preferimos hacerlo a través de la web, hacemos click en el enlace <a href="https://decide.madrid.es/account">"Mi cuenta"</a> de la parte superior derecha, y luego en el botón "Verificar mi cuenta". Lo primero que se nos pedirá es que introduzcamos nuestros datos de residencia, para verificar que estamos empadronados en el municipio de Madrid (es importante introducir el número de documento con la letra; y marcar la casilla de aceptación de acceso al Padrón). Si los datos son correctos, se nos pedirá un teléfono móvil para mandarnos un código de confirmación, que introduciremos en la siguiente página que se nos presente. Este móvil no se utilizará para contactarnos ni para enviarnos nada en ningún momento, sólo es una medida de seguridad. Si preferimos no dar ningún teléfono móvil, podemos realizar el proceso sin necesidad de él en las Oficinas de Atención al Ciudadano, como comentamos anteriormente. Una vez introducido correctamente el código de confirmación, nuestra cuenta nos permitirá apoyar propuestas.</li>
       <li>Para poder acceder a las votaciones finales de las propuestas, tendremos que verificar completamente nuestra cuenta. No obstante recuerda que la votación de propuestas es un proceso muy concreto que sólo ocurre durante una semana una vez las propuestas han llegado al 2% de apoyos, por lo tanto por lo general será posible realizar todas las acciones en la web con la anterior verificación básica de nuestracuenta. Para verificar completamente nuestra cuenta, podemos hacerlo presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank" title="(se abre en ventana nueva)">26 Oficinas de Atención al Ciudadano</a>, o bien a través de la web <a href="https://decide.madrid.es/users/sign_in">entrando</a> con nuestro correo y contraseña, hacer clic en el enlace <a href="https://decide.madrid.es/account">"Mi cuenta"</a> de la parte superior derecha, pulsar el botón "Finalizar verificación", y finalmente hacer click en "Solicitar el envío de un correo postal". Una vez solicitado, nos llegará a nuestra dirección de empadronamiento una carta, con un código de seguridad y unas sencillas instrucciones para realizar la verificación.</li>
     </ul>
diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb
index 4762e309e..4b37ae554 100644
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -84,10 +84,6 @@
       <% end %>
     </div>
 
-    <div class="small-12 column">
-      <%= f.simple_captcha input_html: { required: false } %>
-    </div>
-
     <div class="actions small-12 column">
       <%= f.submit(class: "button", value: t("proposals.#{action_name}.form.submit_button")) %>
     </div>
diff --git a/app/views/simple_captcha/_simple_captcha.erb b/app/views/simple_captcha/_simple_captcha.erb
deleted file mode 100644
index 5f57da6fc..000000000
--- a/app/views/simple_captcha/_simple_captcha.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="captcha">
-  <%= simple_captcha_options[:image] %>
-  <%= simple_captcha_options[:refresh_button] %>
-
-  <p class="note"><%= simple_captcha_options[:label] %></p>
-
-  <%= simple_captcha_options[:field] %>
-</div>
diff --git a/app/views/spending_proposals/_form.html.erb b/app/views/spending_proposals/_form.html.erb
index 0d6ef0402..083d04861 100644
--- a/app/views/spending_proposals/_form.html.erb
+++ b/app/views/spending_proposals/_form.html.erb
@@ -40,12 +40,8 @@
       <% end %>
     </div>
 
-    <div class="small-12 column">
-      <%= f.simple_captcha input_html: { required: false } %>
-    </div>
-
     <div class="actions small-12 column">
       <%= f.submit(class: "button", value: t("spending_proposals.form.submit_buttons.#{action_name}")) %>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index c810ea067..fa9d71118 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -35,8 +35,6 @@
         <%= f.text_field :redeemable_code, placeholder: t("devise_views.users.registrations.new.redeemable_code") %>
       <% end %>
 
-      <%= f.simple_captcha input_html: {required: false} %>
-
       <%= f.label :terms_of_service do %>
         <%= f.check_box :terms_of_service, title: t('devise_views.users.registrations.new.terms_title'), label: false %>
         <span class="checkbox">
diff --git a/config/deploy/shared/secrets.yml.erb b/config/deploy/shared/secrets.yml.erb
index 42a8c48a6..8f82c5dca 100644
--- a/config/deploy/shared/secrets.yml.erb
+++ b/config/deploy/shared/secrets.yml.erb
@@ -1,6 +1,4 @@
 <%= fetch(:rails_env) %>:
-  recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
-  recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
   twitter_key: <%= ENV["TWITTER_KEY"] %>
   twitter_secret: <%= ENV["TWITTER_SECRET"] %>
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 40086aab9..0d7539eee 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -105,7 +105,6 @@ ignore_unused:
   - 'activerecord.*'
   - 'activemodel.*'
   - 'unauthorized.*'
-  - 'simple_captcha.*'
   - 'admin.officials.level_*'
   - 'admin.comments.index.filter*'
   - 'admin.debates.index.filter*'
diff --git a/config/initializers/simple_captcha.rb b/config/initializers/simple_captcha.rb
deleted file mode 100644
index 2ac5826c3..000000000
--- a/config/initializers/simple_captcha.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-SimpleCaptcha.always_pass = false
-
-SimpleCaptcha.setup do |sc|
-  # default: 100x28
-  sc.image_size = '120x40'
-
-  # default: 5
-  sc.length = 6
-
-  # default: simply_blue
-  # possible values:
-  # 'embosed_silver',
-  # 'simply_red',
-  # 'simply_green',
-  # 'simply_blue',
-  # 'distorted_black',
-  # 'all_black',
-  # 'charcoal_grey',
-  # 'almost_invisible'
-  # 'random'
-  sc.image_style = 'simply_green'
-
-  # default: low
-  # possible values: 'low', 'medium', 'high', 'random'
-  sc.distortion = 'random'
-
-  # default: medium
-  # possible values: 'none', 'low', 'medium', 'high'
-  sc.implode = 'medium'
-
-  # sc.image_style = 'mycaptha'
-  # sc.add_image_style('mycaptha', [
-  #     "-background '#F4F7F8'",
-  #     "-fill '#86818B'",
-  #     "-border 1",
-  #     "-bordercolor '#E0E2E3'"])
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index de37b5975..f3002983b 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -417,15 +417,6 @@ en:
       categories: "Categories"
     target_blank_html: " (link opens in new window)"
     unflag: Unflag
-  simple_captcha:
-    label: Enter the text from the image in the box below
-    message:
-      debate: the secret code does not match the image
-      proposal: the secret code does not match the image
-      spendingproposal: the secret code does not match the image
-      user: the secret code does not match the image
-    placeholder: Enter the text from the image
-    refresh_button_text: Refresh
   social:
     blog: Blog
     facebook: Facebook
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d2d01e407..dfd00b2f0 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -417,15 +417,6 @@ es:
       categories: "Categorías"
     target_blank_html: " (se abre en ventana nueva)"
     unflag: Deshacer denuncia
-  simple_captcha:
-    label: Introduce el texto de la imagen en la siguiente caja
-    message:
-      debate: el código secreto no coincide con la imagen
-      proposal: el código secreto no coincide con la imagen
-      spendingproposal: el código secreto no coincide con la imagen
-      user: el código secreto no coincide con la imagen
-    placeholder: Introduce el texto de la imagen
-    refresh_button_text: Refrescar
   social:
     blog: Blog
     facebook: Facebook
diff --git a/db/migrate/20160421090733_destroy_captcha_table.rb b/db/migrate/20160421090733_destroy_captcha_table.rb
new file mode 100644
index 000000000..68d045d2f
--- /dev/null
+++ b/db/migrate/20160421090733_destroy_captcha_table.rb
@@ -0,0 +1,5 @@
+class DestroyCaptchaTable < ActiveRecord::Migration
+  def change
+    drop_table :simple_captcha_data
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 55641228c..b105a2b2c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -286,15 +286,6 @@ ActiveRecord::Schema.define(version: 20160426211658) do
 
   add_index "settings", ["key"], name: "index_settings_on_key", using: :btree
 
-  create_table "simple_captcha_data", force: :cascade do |t|
-    t.string   "key",        limit: 40
-    t.string   "value",      limit: 6
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "simple_captcha_data", ["key"], name: "idx_key", using: :btree
-
   create_table "spending_proposals", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
diff --git a/spec/controllers/debates_controller_spec.rb b/spec/controllers/debates_controller_spec.rb
index 85bf9bd1c..12dc0fe40 100644
--- a/spec/controllers/debates_controller_spec.rb
+++ b/spec/controllers/debates_controller_spec.rb
@@ -2,15 +2,6 @@ require 'rails_helper'
 
 describe DebatesController do
 
-  before(:all) do
-    @original_captcha_pass_value = SimpleCaptcha.always_pass
-    SimpleCaptcha.always_pass = true
-  end
-
-  after(:all) do
-    SimpleCaptcha.always_pass = @original_captcha_pass_value
-  end
-
   describe 'POST create' do
     it 'should create an ahoy event' do
 
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 5efb48406..03e794d74 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -96,7 +96,6 @@ feature 'Debates' do
     visit new_debate_path
     fill_in 'debate_title', with: 'A title for a debate'
     fill_in 'debate_description', with: 'This is very important because...'
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     click_button 'Start a debate'
@@ -108,26 +107,6 @@ feature 'Debates' do
     expect(page).to have_content I18n.l(Debate.last.created_at.to_date)
   end
 
-  scenario 'Captcha is required for debate creation' do
-    login_as(create(:user))
-
-    visit new_debate_path
-    fill_in 'debate_title', with: "Great title"
-    fill_in 'debate_description', with: 'Very important issue...'
-    fill_in 'debate_captcha', with: "wrongText!"
-    check 'debate_terms_of_service'
-
-    click_button "Start a debate"
-
-    expect(page).to_not have_content "Debate created successfully."
-    expect(page).to have_content "1 error"
-
-    fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Start a debate"
-
-    expect(page).to have_content "Debate created successfully."
-  end
-
   scenario 'Errors on create' do
     author = create(:user)
     login_as(author)
@@ -144,7 +123,6 @@ feature 'Debates' do
     visit new_debate_path
     fill_in 'debate_title', with: 'Testing an attack'
     fill_in 'debate_description', with: '<p>This is <script>alert("an attack");</script></p>'
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     click_button 'Start a debate'
@@ -163,7 +141,6 @@ feature 'Debates' do
     visit new_debate_path
     fill_in 'debate_title', with: 'Testing auto link'
     fill_in 'debate_description', with: '<p>This is a link www.example.org</p>'
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     click_button 'Start a debate'
@@ -180,7 +157,6 @@ feature 'Debates' do
     visit new_debate_path
     fill_in 'debate_title', with: 'Testing auto link'
     fill_in 'debate_description', with: "<script>alert('hey')</script> <a href=\"javascript:alert('surprise!')\">click me<a/> http://example.org"
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     click_button 'Start a debate'
@@ -213,7 +189,6 @@ feature 'Debates' do
 
       fill_in 'debate_title', with: 'Testing auto link'
       fill_in 'debate_description', with: "<script>alert('hey')</script> <a href=\"javascript:alert('surprise!')\">click me<a/> http://example.org"
-      fill_in 'debate_captcha', with: correct_captcha_text
       check 'debate_terms_of_service'
 
       find('.js-add-tag-link', text: 'Education').click
@@ -232,7 +207,6 @@ feature 'Debates' do
 
       fill_in 'debate_title', with: "Great title"
       fill_in 'debate_description', with: 'Very important issue...'
-      fill_in 'debate_captcha', with: correct_captcha_text
       check 'debate_terms_of_service'
 
       fill_in 'debate_tag_list', with: 'Refugees, Solidarity'
@@ -250,7 +224,6 @@ feature 'Debates' do
 
       fill_in 'debate_title', with: 'A test of dangerous strings'
       fill_in 'debate_description', with: 'A description suitable for this test'
-      fill_in 'debate_captcha', with: correct_captcha_text
       check 'debate_terms_of_service'
 
       fill_in 'debate_tag_list', with: 'user_id=1, &a=3, <script>alert("hey");</script>'
@@ -300,7 +273,6 @@ feature 'Debates' do
 
     fill_in 'debate_title', with: "End child poverty"
     fill_in 'debate_description', with: "Let's do something to end child poverty"
-    fill_in 'debate_captcha', with: correct_captcha_text
 
     click_button "Save changes"
 
@@ -320,26 +292,6 @@ feature 'Debates' do
     expect(page).to have_content error_message
   end
 
-  scenario 'Captcha is required to update a debate' do
-    debate = create(:debate)
-    login_as(debate.author)
-
-    visit edit_debate_path(debate)
-    expect(current_path).to eq(edit_debate_path(debate))
-
-    fill_in 'debate_title', with: "New title"
-    fill_in 'debate_captcha', with: "wrong!"
-    click_button "Save changes"
-
-    expect(page).to_not have_content "Debate updated successfully."
-    expect(page).to have_content "error"
-
-    fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Save changes"
-
-    expect(page).to have_content "Debate updated successfully."
-  end
-
   describe 'Limiting tags shown' do
     scenario 'Index page shows up to 5 tags per debate' do
       tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb
index e5279bac4..744a8fe0b 100644
--- a/spec/features/management/proposals_spec.rb
+++ b/spec/features/management/proposals_spec.rb
@@ -27,7 +27,6 @@ feature 'Proposals' do
       fill_in 'proposal_description', with: 'This is very important because...'
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_video_url', with: 'http://youtube.com'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       click_button 'Create proposal'
diff --git a/spec/features/management/spending_proposals_spec.rb b/spec/features/management/spending_proposals_spec.rb
index 760d2a07a..2c20ee684 100644
--- a/spec/features/management/spending_proposals_spec.rb
+++ b/spec/features/management/spending_proposals_spec.rb
@@ -24,7 +24,6 @@ feature 'Spending Proposals' do
       fill_in 'spending_proposal_title', with: 'Build a park in my neighborhood'
       fill_in 'spending_proposal_description', with: 'There is no parks here...'
       fill_in 'spending_proposal_external_url', with: 'http://moarparks.com'
-      fill_in 'spending_proposal_captcha', with: correct_captcha_text
       check 'spending_proposal_terms_of_service'
 
       click_button 'Create'
@@ -221,4 +220,4 @@ feature 'Spending Proposals' do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/features/organizations_spec.rb b/spec/features/organizations_spec.rb
index 052b3bae5..343f31228 100644
--- a/spec/features/organizations_spec.rb
+++ b/spec/features/organizations_spec.rb
@@ -13,7 +13,6 @@ feature 'Organizations' do
     fill_in 'user_email',                         with: 'green@peace.com'
     fill_in 'user_password',                      with: 'greenpeace'
     fill_in 'user_password_confirmation',         with: 'greenpeace'
-    fill_in 'user_captcha', with: correct_captcha_text
     check 'user_terms_of_service'
 
     click_button 'Register'
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 4a3ea58a1..c2d8c5aaf 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -130,7 +130,6 @@ feature 'Proposals' do
     fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
     fill_in 'proposal_video_url', with: 'http://youtube.com'
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     check 'proposal_terms_of_service'
 
     click_button 'Create proposal'
@@ -157,7 +156,6 @@ feature 'Proposals' do
     fill_in 'proposal_description', with: 'This is very important because...'
     fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
     check 'proposal_terms_of_service'
 
@@ -179,7 +177,6 @@ feature 'Proposals' do
     fill_in 'proposal_summary', with: 'In summary, what we want is...'
     fill_in 'proposal_description', with: 'This is very important because...'
     fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     check 'proposal_terms_of_service'
 
     click_button 'Create proposal'
@@ -187,30 +184,6 @@ feature 'Proposals' do
     expect(page).to have_content 'Proposal created successfully.'
   end
 
-  scenario 'Captcha is required for proposal creation' do
-    login_as(create(:user))
-
-    visit new_proposal_path
-    fill_in 'proposal_title', with: "Great title"
-    fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?'
-    fill_in 'proposal_summary', with: 'In summary, what we want is...'
-    fill_in 'proposal_description', with: 'Very important issue...'
-    fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
-    fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: "wrongText!"
-    check 'proposal_terms_of_service'
-
-    click_button "Create proposal"
-
-    expect(page).to_not have_content "Proposal created successfully."
-    expect(page).to have_content "1 error"
-
-    fill_in 'proposal_captcha', with: correct_captcha_text
-    click_button "Create proposal"
-
-    expect(page).to have_content "Proposal created successfully."
-  end
-
   scenario 'Errors on create' do
     author = create(:user)
     login_as(author)
@@ -231,7 +204,6 @@ feature 'Proposals' do
     fill_in 'proposal_description', with: '<p>This is <script>alert("an attack");</script></p>'
     fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     check 'proposal_terms_of_service'
 
     click_button 'Create proposal'
@@ -253,7 +225,6 @@ feature 'Proposals' do
     fill_in 'proposal_summary', with: 'In summary, what we want is...'
     fill_in 'proposal_description', with: '<p>This is a link www.example.org</p>'
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     check 'proposal_terms_of_service'
 
     click_button 'Create proposal'
@@ -273,7 +244,6 @@ feature 'Proposals' do
     fill_in 'proposal_summary', with: 'In summary, what we want is...'
     fill_in 'proposal_description', with: "<script>alert('hey')</script> <a href=\"javascript:alert('surprise!')\">click me<a/> http://example.org"
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
     check 'proposal_terms_of_service'
 
     click_button 'Create proposal'
@@ -311,7 +281,6 @@ feature 'Proposals' do
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_video_url', with: 'http://youtube.com'
       fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       find('.js-add-tag-link', text: 'Education').click
@@ -335,7 +304,6 @@ feature 'Proposals' do
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_video_url', with: 'http://youtube.com'
       fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       fill_in 'proposal_tag_list', with: 'Refugees, Solidarity'
@@ -360,7 +328,6 @@ feature 'Proposals' do
       fill_in 'proposal_description', with: 'A description suitable for this test'
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       fill_in 'proposal_tag_list', with: 'user_id=1, &a=3, <script>alert("hey");</script>'
@@ -390,7 +357,6 @@ feature 'Proposals' do
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_video_url', with: 'http://youtube.com'
       fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       click_button 'Create proposal'
@@ -416,7 +382,6 @@ feature 'Proposals' do
       fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
       fill_in 'proposal_video_url', with: 'http://youtube.com'
       fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-      fill_in 'proposal_captcha', with: correct_captcha_text
       check 'proposal_terms_of_service'
 
       select('California', from: 'proposal_geozone_id')
@@ -563,7 +528,6 @@ feature 'Proposals' do
     fill_in 'proposal_description', with: "Let's do something to end child poverty"
     fill_in 'proposal_external_url', with: 'http://rescue.org/refugees'
     fill_in 'proposal_responsible_name', with: 'Isabel Garcia'
-    fill_in 'proposal_captcha', with: correct_captcha_text
 
     click_button "Save changes"
 
@@ -584,26 +548,6 @@ feature 'Proposals' do
     expect(page).to have_content error_message
   end
 
-  scenario 'Captcha is required to update a proposal' do
-    proposal = create(:proposal)
-    login_as(proposal.author)
-
-    visit edit_proposal_path(proposal)
-    expect(current_path).to eq(edit_proposal_path(proposal))
-
-    fill_in 'proposal_title', with: "New cool title"
-    fill_in 'proposal_captcha', with: "wrong!"
-    click_button "Save changes"
-
-    expect(page).to_not have_content "Proposal updated successfully."
-    expect(page).to have_content "error"
-
-    fill_in 'proposal_captcha', with: correct_captcha_text
-    click_button "Save changes"
-
-    expect(page).to have_content "Proposal updated successfully."
-  end
-
   describe 'Limiting tags shown' do
     scenario 'Index page shows up to 5 tags per proposal' do
       create_featured_proposals
diff --git a/spec/features/registration_form_spec.rb b/spec/features/registration_form_spec.rb
index 6439ac726..b14b200a0 100644
--- a/spec/features/registration_form_spec.rb
+++ b/spec/features/registration_form_spec.rb
@@ -32,7 +32,6 @@ feature 'Registration form' do
     fill_in 'user_password',              with: "password"
     fill_in 'user_password_confirmation', with: "password"
     fill_in 'user_redeemable_code',       with: "            "
-    fill_in 'user_captcha',               with: correct_captcha_text
     check 'user_terms_of_service'
 
     click_button 'Register'
diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb
index cb3a6d8d5..dbfdfdf34 100644
--- a/spec/features/spending_proposals_spec.rb
+++ b/spec/features/spending_proposals_spec.rb
@@ -97,7 +97,6 @@ feature 'Spending proposals' do
     fill_in 'spending_proposal_description', with: 'I want to live in a high tower over the clouds'
     fill_in 'spending_proposal_external_url', with: 'http://http://skyscraperpage.com/'
     fill_in 'spending_proposal_association_name', with: 'People of the neighbourhood'
-    fill_in 'spending_proposal_captcha', with: correct_captcha_text
     select  'All city', from: 'spending_proposal_geozone_id'
     check 'spending_proposal_terms_of_service'
 
@@ -119,7 +118,6 @@ feature 'Spending proposals' do
     fill_in 'spending_proposal_description', with: 'I want to live in a high tower over the clouds'
     fill_in 'spending_proposal_external_url', with: 'http://http://skyscraperpage.com/'
     fill_in 'spending_proposal_association_name', with: 'People of the neighbourhood'
-    fill_in 'spending_proposal_captcha', with: correct_captcha_text
     select  'All city', from: 'spending_proposal_geozone_id'
     check 'spending_proposal_terms_of_service'
 
@@ -137,27 +135,6 @@ feature 'Spending proposals' do
     expect(page).to have_content "Build a skyscraper"
   end
 
-  scenario 'Captcha is required for proposal creation' do
-    login_as(author)
-
-    visit new_spending_proposal_path
-    fill_in 'spending_proposal_title', with: 'Build a skyscraper'
-    fill_in 'spending_proposal_description', with: 'I want to live in a high tower over the clouds'
-    fill_in 'spending_proposal_external_url', with: 'http://http://skyscraperpage.com/'
-    fill_in 'spending_proposal_captcha', with: 'wrongText'
-    check 'spending_proposal_terms_of_service'
-
-    click_button 'Create'
-
-    expect(page).to_not have_content 'Spending proposal created successfully'
-    expect(page).to have_content '1 error'
-
-    fill_in 'spending_proposal_captcha', with: correct_captcha_text
-    click_button 'Create'
-
-    expect(page).to have_content 'Spending proposal created successfully'
-  end
-
   scenario 'Errors on create' do
     login_as(author)
 
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index a67f412a3..7ac81c139 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -61,7 +61,6 @@ feature 'Tags' do
     visit new_debate_path
     fill_in 'debate_title', with: 'Title'
     fill_in 'debate_description', with: 'Description'
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda"
@@ -81,7 +80,6 @@ feature 'Tags' do
     visit new_debate_path
     fill_in 'debate_title', with: 'Title'
     fill_in 'debate_description', with: 'Description'
-    fill_in 'debate_captcha', with: correct_captcha_text
     check 'debate_terms_of_service'
 
     fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda, Sanidad, Educación, Política, Igualdad"
@@ -101,7 +99,6 @@ feature 'Tags' do
     expect(page).to have_selector("input[value='Economía']")
 
     fill_in 'debate_tag_list', with: "Economía, Hacienda"
-    fill_in 'debate_captcha', with: correct_captcha_text
     click_button 'Save changes'
 
     expect(page).to have_content 'Debate updated successfully.'
@@ -118,7 +115,6 @@ feature 'Tags' do
     visit edit_debate_path(debate)
 
     fill_in 'debate_tag_list', with: ""
-    fill_in 'debate_captcha', with: correct_captcha_text
     click_button 'Save changes'
 
     expect(page).to have_content 'Debate updated successfully.'
diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb
index f9b92bb12..bd93a04f8 100644
--- a/spec/features/users_auth_spec.rb
+++ b/spec/features/users_auth_spec.rb
@@ -11,7 +11,6 @@ feature 'Users' do
       fill_in 'user_email',                 with: 'manuela@madrid.es'
       fill_in 'user_password',              with: 'judgementday'
       fill_in 'user_password_confirmation', with: 'judgementday'
-      fill_in 'user_captcha',               with: correct_captcha_text
       check 'user_terms_of_service'
 
       click_button 'Register'
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 340d7c8a7..bba79441b 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -9,7 +9,6 @@ module CommonActions
     fill_in 'user_email',                 with: email
     fill_in 'user_password',              with: password
     fill_in 'user_password_confirmation', with: password
-    fill_in 'user_captcha',               with: correct_captcha_text
     check 'user_terms_of_service'
 
     click_button 'Register'
@@ -86,10 +85,6 @@ module CommonActions
     expect(page).to have_content 'It will be done next week.'
   end
 
-  def correct_captcha_text
-    SimpleCaptcha::SimpleCaptchaData.last.value
-  end
-
   def avatar(name)
     "img.initialjs-avatar[data-name='#{name}']"
   end

From 54a3cc40b79058a19be4dc31e189e2c98247e672 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 25 Apr 2016 11:56:55 +0200
Subject: [PATCH 02/15] Adds invisible_captcha gem

---
 Gemfile      | 1 +
 Gemfile.lock | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 7bfac1b15..876ff1e07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'foundation-rails'
 gem 'foundation_rails_helper'
 gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.1.5'
+gem 'invisible_captcha'
 gem 'cancancan'
 gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
 gem 'initialjs-rails', '0.2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bc02c6ce..6502986af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,6 +202,8 @@ GEM
       terminal-table (>= 1.5.1)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
+    invisible_captcha (0.8.1)
+      rails
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -467,6 +469,7 @@ DEPENDENCIES
   groupdate
   i18n-tasks
   initialjs-rails (= 0.2.0.1)
+  invisible_captcha
   jquery-rails
   jquery-ui-rails
   kaminari

From eedf02a18625f588fad226d92d3f75d85b0cb021 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 25 Apr 2016 14:45:59 +0200
Subject: [PATCH 03/15] Starts using invisible_captcha in the source code.
 Pending: tests, proper invisible_captcha gem in Gemfile

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 12 +++++++---
 app/controllers/debates_controller.rb         |  2 ++
 app/controllers/proposals_controller.rb       |  2 ++
 .../spending_proposals_controller.rb          |  2 ++
 app/views/debates/_form.html.erb              |  5 ++++
 app/views/proposals/_form.html.erb            |  2 ++
 app/views/spending_proposals/_form.html.erb   |  2 ++
 config/initializers/invisible_captcha.rb      |  8 +++++++
 config/locales/en.yml                         |  5 ++++
 config/locales/es.yml                         |  4 ++++
 spec/features/proposals_spec.rb               | 23 +++++++++++++++++++
 12 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 config/initializers/invisible_captcha.rb

diff --git a/Gemfile b/Gemfile
index 876ff1e07..2b0cae0a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'foundation-rails'
 gem 'foundation_rails_helper'
 gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.1.5'
-gem 'invisible_captcha'
+gem 'invisible_captcha', git: 'https://github.com/kikito/invisible_captcha', branch: 'timestamp_in_session'
 gem 'cancancan'
 gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
 gem 'initialjs-rails', '0.2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6502986af..2d1ec45d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,14 @@ GIT
       coffee-rails
       sass-rails
 
+GIT
+  remote: https://github.com/kikito/invisible_captcha
+  revision: b5c6ebe4cfaa029012de7279314ce26709d80199
+  branch: timestamp_in_session
+  specs:
+    invisible_captcha (0.8.1)
+      rails
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -202,8 +210,6 @@ GEM
       terminal-table (>= 1.5.1)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
-    invisible_captcha (0.8.1)
-      rails
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -469,7 +475,7 @@ DEPENDENCIES
   groupdate
   i18n-tasks
   initialjs-rails (= 0.2.0.1)
-  invisible_captcha
+  invisible_captcha!
   jquery-rails
   jquery-ui-rails
   kaminari
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 40e198148..e077e5e8a 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -11,6 +11,8 @@ class DebatesController < ApplicationController
 
   feature_flag :debates
 
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
+
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
 
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 9153df449..8ec71b8f6 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -10,6 +10,8 @@ class ProposalsController < ApplicationController
   before_action :load_geozones, only: [:edit, :map, :summary]
   before_action :authenticate_user!, except: [:index, :show, :map, :summary]
 
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
+
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
 
diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index 64172ed56..3f590f414 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -8,6 +8,8 @@ class SpendingProposalsController < ApplicationController
 
   feature_flag :spending_proposals
 
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
+
   respond_to :html, :js
 
   def index
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index 2e19b5d2b..30152b366 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -1,5 +1,8 @@
 <%= form_for(@debate) do |f| %>
+
+
   <%= render 'shared/errors', resource: @debate %>
+
   <div class="row">
     <div class="small-12 column">
       <%= f.label :title, t("debates.form.debate_title") %>
@@ -11,6 +14,8 @@
       <%= f.cktext_area :description, maxlength: Debate.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
     </div>
 
+    <%= f.invisible_captcha :subtitle %>
+
     <div class="small-12 column">
       <%= f.label :tag_list, t("debates.form.tags_label") %>
       <p class="note"><%= t("debates.form.tags_instructions") %></p>
diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb
index 4b37ae554..3eda38cd1 100644
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -8,6 +8,8 @@
     </div>
     <div id="js-suggest"></div>
 
+    <%= f.invisible_captcha :subtitle %>
+
     <div class="small-12 column">
       <%= f.label :question, t("proposals.form.proposal_question") %>
       <span class="note-marked">
diff --git a/app/views/spending_proposals/_form.html.erb b/app/views/spending_proposals/_form.html.erb
index 083d04861..2976b1803 100644
--- a/app/views/spending_proposals/_form.html.erb
+++ b/app/views/spending_proposals/_form.html.erb
@@ -7,6 +7,8 @@
       <%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("spending_proposals.form.title"), label: false %>
     </div>
 
+    <%= f.invisible_captcha :subtitle %>
+
     <div class="ckeditor small-12 column">
       <%= f.label :description, t("spending_proposals.form.description") %>
       <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
diff --git a/config/initializers/invisible_captcha.rb b/config/initializers/invisible_captcha.rb
new file mode 100644
index 000000000..0dd1c5a5c
--- /dev/null
+++ b/config/initializers/invisible_captcha.rb
@@ -0,0 +1,8 @@
+InvisibleCaptcha.setup do |config|
+  config.visual_honeypots        = false
+  config.timestamp_threshold     = 4.seconds
+  # Leave these unset if you want to use I18n (see below)
+  # config.error_message           = 'You are a robot!'
+  # config.sentence_for_humans     = 'If you are a human, ignore this field'
+  # config.timestamp_error_message = 'Sorry, that was too quick! Please resubmit.'
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f3002983b..57dcb4e87 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -582,3 +582,8 @@ en:
       text_sign_in: "login"
       text_sign_up: "sign up"
       alt: "Select the text you want to comment and press the button with the pencil."
+  invisible_captcha:
+    sentence_for_humans: "If you are human, ignore this field"
+    error_message: "Robot activity detected"
+    timestamp_error_message: "Sorry, that was too quick! Please resubmit."
+
diff --git a/config/locales/es.yml b/config/locales/es.yml
index dfd00b2f0..84cafe4d2 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -582,3 +582,7 @@ es:
       text_sign_in: "iniciar sesión"
       text_sign_up: "registrarte"
       alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
+  inv invisible_captcha:
+    sentence_for_humans: "Si eres humano, por favor ignora este campo"
+    error_message: "Eres un robot!"
+    timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index c2d8c5aaf..f37896c6a 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -145,6 +145,29 @@ feature 'Proposals' do
     expect(page).to have_content I18n.l(Proposal.last.created_at.to_date)
   end
 
+  scenario 'Create with invisible_captcha honeypot field' do
+    # Display the honeypot so capybara can fill it as a spammer would do
+    allow(InvisibleCaptcha).to receive(:visual_honeypots).and_return(true)
+
+    author = create(:user)
+    login_as(author)
+
+    visit new_proposal_path
+    fill_in 'proposal_title', with: 'I am a bot'
+    fill_in 'proposal_subtitle', with: 'This is the honeypot field'
+    fill_in 'proposal_question', with: 'This is a question'
+    fill_in 'proposal_summary', with: 'This is the summary'
+    fill_in 'proposal_description', with: 'This is the description'
+    fill_in 'proposal_external_url', with: 'http://google.com/robots.txt'
+    fill_in 'proposal_responsible_name', with: 'Some other robot'
+    check 'proposal_terms_of_service'
+
+    click_button 'Create proposal'
+
+    expect(page).to_not have_content 'Proposal created successfully.'
+    expect(current_path).to eq(root_path)
+  end
+
   scenario 'Responsible name is stored for anonymous users' do
     author = create(:user)
     login_as(author)

From 4b74a696808b3dc6ec82410c8aabf9cb91500289 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 26 Apr 2016 17:01:59 +0200
Subject: [PATCH 04/15] Points Gemfile to invisible_captcha's git repo

---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b0cae0a2..a711c8f07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'foundation-rails'
 gem 'foundation_rails_helper'
 gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.1.5'
-gem 'invisible_captcha', git: 'https://github.com/kikito/invisible_captcha', branch: 'timestamp_in_session'
+gem 'invisible_captcha', git: 'https://github.com/markets/invisible_captcha'
 gem 'cancancan'
 gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
 gem 'initialjs-rails', '0.2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2d1ec45d4..bd451c38f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,9 +8,8 @@ GIT
       sass-rails
 
 GIT
-  remote: https://github.com/kikito/invisible_captcha
-  revision: b5c6ebe4cfaa029012de7279314ce26709d80199
-  branch: timestamp_in_session
+  remote: https://github.com/markets/invisible_captcha
+  revision: 344ce197b8e0761c037fd70a9937ce5e2f22f80a
   specs:
     invisible_captcha (0.8.1)
       rails

From 289182b145422931a242fec6908a0188c88b7191 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 26 Apr 2016 17:12:09 +0200
Subject: [PATCH 05/15] Adds invisible_captcha to proposals, debates & sps

---
 app/controllers/debates_controller.rb         |  6 +++-
 app/controllers/proposals_controller.rb       |  8 ++++-
 .../spending_proposals_controller.rb          |  6 +++-
 spec/features/debates_spec.rb                 | 35 +++++++++++++++++++
 spec/features/proposals_spec.rb               | 30 +++++++++++++---
 spec/features/spending_proposals_spec.rb      | 34 ++++++++++++++++++
 spec/spec_helper.rb                           |  1 +
 7 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index e077e5e8a..80d408aff 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -11,7 +11,7 @@ class DebatesController < ApplicationController
 
   feature_flag :debates
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle
+  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
 
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
@@ -54,4 +54,8 @@ class DebatesController < ApplicationController
       Debate
     end
 
+    def redirect_timestamp_spam
+      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
+    end
+
 end
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 8ec71b8f6..78b6977c8 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -2,6 +2,7 @@ class ProposalsController < ApplicationController
   include CommentableActions
   include FlagActions
 
+
   before_action :parse_search_terms, only: [:index, :suggest]
   before_action :parse_advanced_search_terms, only: :index
   before_action :parse_tag_filter, only: :index
@@ -10,7 +11,7 @@ class ProposalsController < ApplicationController
   before_action :load_geozones, only: [:edit, :map, :summary]
   before_action :authenticate_user!, except: [:index, :show, :map, :summary]
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle
+  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
 
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
@@ -95,4 +96,9 @@ class ProposalsController < ApplicationController
         @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))
       end
     end
+
+    def redirect_timestamp_spam
+      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
+    end
+
 end
diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index 3f590f414..ebab6cac7 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -8,7 +8,7 @@ class SpendingProposalsController < ApplicationController
 
   feature_flag :spending_proposals
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle
+  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
 
   respond_to :html, :js
 
@@ -72,4 +72,8 @@ class SpendingProposalsController < ApplicationController
       target
     end
 
+    def redirect_timestamp_spam
+      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
+    end
+
 end
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 03e794d74..3c88b1a95 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -107,6 +107,41 @@ feature 'Debates' do
     expect(page).to have_content I18n.l(Debate.last.created_at.to_date)
   end
 
+  scenario 'Create with invisible_captcha honeypot field' do
+    author = create(:user)
+    login_as(author)
+
+    visit new_debate_path
+    fill_in 'debate_title', with: 'I am a bot'
+    fill_in 'debate_subtitle', with: 'This is a honeypot field'
+    fill_in 'debate_description', with: 'This is the description'
+    check 'debate_terms_of_service'
+
+    click_button 'Start a debate'
+
+    expect(page.status_code).to eq(200)
+    expect(page.html).to be_empty
+    expect(current_path).to eq(debates_path)
+  end
+
+  scenario 'Create debate too fast' do
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(Float::INFINITY)
+
+    author = create(:user)
+    login_as(author)
+
+    visit new_debate_path
+    fill_in 'debate_title', with: 'I am a bot'
+    fill_in 'debate_description', with: 'This is the description'
+    check 'debate_terms_of_service'
+
+    click_button 'Start a debate'
+
+    expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
+
+    expect(current_path).to eq(proposals_path)
+  end
+
   scenario 'Errors on create' do
     author = create(:user)
     login_as(author)
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index f37896c6a..4510269d5 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -146,9 +146,6 @@ feature 'Proposals' do
   end
 
   scenario 'Create with invisible_captcha honeypot field' do
-    # Display the honeypot so capybara can fill it as a spammer would do
-    allow(InvisibleCaptcha).to receive(:visual_honeypots).and_return(true)
-
     author = create(:user)
     login_as(author)
 
@@ -164,8 +161,31 @@ feature 'Proposals' do
 
     click_button 'Create proposal'
 
-    expect(page).to_not have_content 'Proposal created successfully.'
-    expect(current_path).to eq(root_path)
+    expect(page.status_code).to eq(200)
+    expect(page.html).to be_empty
+    expect(current_path).to eq(proposals_path)
+  end
+
+  scenario 'Create proposal too fast' do
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(Float::INFINITY)
+
+    author = create(:user)
+    login_as(author)
+
+    visit new_proposal_path
+    fill_in 'proposal_title', with: 'I am a bot'
+    fill_in 'proposal_question', with: 'This is a question'
+    fill_in 'proposal_summary', with: 'This is the summary'
+    fill_in 'proposal_description', with: 'This is the description'
+    fill_in 'proposal_external_url', with: 'http://google.com/robots.txt'
+    fill_in 'proposal_responsible_name', with: 'Some other robot'
+    check 'proposal_terms_of_service'
+
+    click_button 'Create proposal'
+
+    expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
+
+    expect(current_path).to eq(spending_proposals_path)
   end
 
   scenario 'Responsible name is stored for anonymous users' do
diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb
index dbfdfdf34..392a3f56f 100644
--- a/spec/features/spending_proposals_spec.rb
+++ b/spec/features/spending_proposals_spec.rb
@@ -110,6 +110,40 @@ feature 'Spending proposals' do
     expect(page).to have_content('All city')
   end
 
+  scenario 'Create with invisible_captcha honeypot field' do
+    login_as(author)
+
+    visit new_spending_proposal_path
+    fill_in 'spending_proposal_title', with: 'I am a bot'
+    fill_in 'spending_proposal_subtitle', with: 'This is the honeypot'
+    fill_in 'spending_proposal_description', with: 'This is the description'
+    select  'All city', from: 'spending_proposal_geozone_id'
+    check 'spending_proposal_terms_of_service'
+
+    click_button 'Create'
+
+    expect(page.status_code).to eq(200)
+    expect(page.html).to be_empty
+    expect(current_path).to eq(spending_proposals_path)
+  end
+
+  scenario 'Create spending proposal too fast' do
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(Float::INFINITY)
+
+    login_as(author)
+
+    visit new_spending_proposal_path
+    fill_in 'spending_proposal_title', with: 'I am a bot'
+    fill_in 'spending_proposal_description', with: 'This is the description'
+    select  'All city', from: 'spending_proposal_geozone_id'
+    check 'spending_proposal_terms_of_service'
+
+    click_button 'Create'
+
+    expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
+    expect(current_path).to eq(proposals_path)
+  end
+
   scenario 'Create notice' do
     login_as(author)
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 80d88bc54..c1d391b66 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -63,6 +63,7 @@ RSpec.configure do |config|
 
   config.before(:each, type: :feature) do
     Bullet.start_request
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(0)
   end
 
   config.after(:each, type: :feature) do

From 7adc706d23096dfd6ab3ac4c6f477af0ae5918eb Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 26 Apr 2016 17:26:47 +0200
Subject: [PATCH 06/15] Moves redirect_timestamp_spam to AppController

---
 app/controllers/application_controller.rb        | 3 +++
 app/controllers/debates_controller.rb            | 4 ----
 app/controllers/spending_proposals_controller.rb | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 10a3c97b9..224ff26eb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -115,4 +115,7 @@ class ApplicationController < ActionController::Base
       end
     end
 
+    def redirect_timestamp_spam
+      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
+    end
 end
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 80d408aff..67f40ce6c 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -54,8 +54,4 @@ class DebatesController < ApplicationController
       Debate
     end
 
-    def redirect_timestamp_spam
-      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
-    end
-
 end
diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index ebab6cac7..870e32814 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -72,8 +72,4 @@ class SpendingProposalsController < ApplicationController
       target
     end
 
-    def redirect_timestamp_spam
-      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
-    end
-
 end

From 4a95c85c482c85f23d3af7adb0812fc081d7eb07 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 26 Apr 2016 19:10:19 +0200
Subject: [PATCH 07/15] Fixes typo in es.yml

---
 config/locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 84cafe4d2..9623bcb54 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -582,7 +582,7 @@ es:
       text_sign_in: "iniciar sesión"
       text_sign_up: "registrarte"
       alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
-  inv invisible_captcha:
+  invisible_captcha:
     sentence_for_humans: "Si eres humano, por favor ignora este campo"
     error_message: "Eres un robot!"
     timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."

From 303b17c238af6c6ea3f1ef7d9336086914032c49 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 26 Apr 2016 19:10:55 +0200
Subject: [PATCH 08/15] Adds invisible_captcha to user & organization
 registrations

---
 .../organizations/registrations_controller.rb |  2 ++
 .../users/registrations_controller.rb         |  2 ++
 .../organizations/registrations/new.html.erb  |  2 ++
 app/views/users/registrations/new.html.erb    |  2 ++
 spec/features/organizations_spec.rb           | 35 ++++++++++++++++++
 spec/features/registration_form_spec.rb       | 36 +++++++++++++++++++
 6 files changed, 79 insertions(+)

diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index b0b177f09..29d45a108 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -1,5 +1,7 @@
 class Organizations::RegistrationsController < Devise::RegistrationsController
 
+  invisible_captcha only: [:create], honeypot: :address, scope: :user, on_timestamp_spam: :redirect_timestamp_spam
+
   def new
     super do |user|
       user.build_organization
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index da9fc1372..0c1e067fb 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -1,6 +1,8 @@
 class Users::RegistrationsController < Devise::RegistrationsController
   prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy, :finish_signup, :do_finish_signup]
 
+  invisible_captcha only: [:create], honeypot: :family_name, scope: :user, on_timestamp_spam: :redirect_timestamp_spam
+
   def new
     super do |user|
       user.use_redeemable_code = true if params[:use_redeemable_code].present?
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 01483fda5..3b1763e83 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -17,6 +17,8 @@
 
       <%= f.text_field  :phone_number,  placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %>
 
+      <%= f.invisible_captcha :address %>
+
       <%= f.password_field :password, autocomplete: "off",
                            placeholder: t("devise_views.organizations.registrations.new.password_label") %>
 
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index fa9d71118..f2f1827ba 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -21,6 +21,8 @@
       <p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p>
       <%= f.text_field  :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
 
+      <%= f.invisible_captcha :family_name %>
+
       <%= f.email_field :email,     placeholder: t("devise_views.users.registrations.new.email_label") %>
 
 
diff --git a/spec/features/organizations_spec.rb b/spec/features/organizations_spec.rb
index 343f31228..3a84d7adf 100644
--- a/spec/features/organizations_spec.rb
+++ b/spec/features/organizations_spec.rb
@@ -23,6 +23,41 @@ feature 'Organizations' do
     expect(user.organization).to_not be_verified
   end
 
+  scenario 'Create with invisible_captcha honeypot field' do
+    visit new_organization_registration_path
+
+    fill_in 'user_organization_attributes_name',  with: 'robot'
+    fill_in 'user_address',                       with: 'This is the honeypot field'
+    fill_in 'user_organization_attributes_responsible_name', with: 'Robots are more responsible than humans'
+    fill_in 'user_email',                         with: 'robot@robot.com'
+    fill_in 'user_password',                      with: 'destroyallhumans'
+    fill_in 'user_password_confirmation',         with: 'destroyallhumans'
+
+    check 'user_terms_of_service'
+
+    click_button 'Register'
+
+    expect(page.status_code).to eq(200)
+    expect(page.html).to be_empty
+    expect(current_path).to eq(organization_registration_path)
+  end
+
+  scenario 'Create organization too fast' do
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(Float::INFINITY)
+    visit new_organization_registration_path
+    fill_in 'user_organization_attributes_name',  with: 'robot'
+    fill_in 'user_organization_attributes_responsible_name', with: 'Robots are more responsible than humans'
+    fill_in 'user_email',                         with: 'robot@robot.com'
+    fill_in 'user_password',                      with: 'destroyallhumans'
+    fill_in 'user_password_confirmation',         with: 'destroyallhumans'
+
+    click_button 'Register'
+
+    expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
+
+    expect(current_path).to eq(root_path)
+  end
+
   scenario 'Errors on create' do
     visit new_organization_registration_path
 
diff --git a/spec/features/registration_form_spec.rb b/spec/features/registration_form_spec.rb
index b14b200a0..42a5645dc 100644
--- a/spec/features/registration_form_spec.rb
+++ b/spec/features/registration_form_spec.rb
@@ -43,4 +43,40 @@ feature 'Registration form' do
     expect(new_user.redeemable_code).to be_nil
   end
 
+  scenario 'Create with invisible_captcha honeypot field' do
+    visit new_user_registration_path
+
+    fill_in 'user_username',              with: "robot"
+    fill_in 'user_family_name',           with: 'This is the honeypot field'
+    fill_in 'user_email',                 with: 'robot@robot.com'
+    fill_in 'user_password',              with: 'destroyallhumans'
+    fill_in 'user_password_confirmation', with: 'destroyallhumans'
+    check 'user_terms_of_service'
+
+    click_button 'Register'
+
+    expect(page.status_code).to eq(200)
+    expect(page.html).to be_empty
+    expect(current_path).to eq(user_registration_path)
+  end
+
+  scenario 'Create organization too fast' do
+    allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(Float::INFINITY)
+    visit new_user_registration_path
+
+    fill_in 'user_username',              with: "robot"
+    fill_in 'user_family_name',           with: 'This is the honeypot field'
+    fill_in 'user_email',                 with: 'robot@robot.com'
+    fill_in 'user_password',              with: 'destroyallhumans'
+    fill_in 'user_password_confirmation', with: 'destroyallhumans'
+    check 'user_terms_of_service'
+
+    click_button 'Register'
+
+    expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
+
+    expect(current_path).to eq(root_path)
+  end
+
+
 end

From 708804fb5fe9b7f0bd2054490afb1ce6c66c670a Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 27 Apr 2016 13:54:10 +0200
Subject: [PATCH 09/15] fixes invisible_captcha i18n errors

---
 config/i18n-tasks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 0d7539eee..b81c73ddd 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -136,6 +136,7 @@ ignore_unused:
   - 'helpers.page_entries_info.*' # kaminari
   - 'views.pagination.*' # kaminari
   - 'shared.suggest.*'
+  - 'invisible_captcha.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

From 1a5156647161d3a77ea65d425fea2be822ab9e3f Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 27 Apr 2016 13:55:59 +0200
Subject: [PATCH 10/15] fixes typo in proposals_spec

---
 spec/features/proposals_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 4510269d5..c5a202543 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -185,7 +185,7 @@ feature 'Proposals' do
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
 
-    expect(current_path).to eq(spending_proposals_path)
+    expect(current_path).to eq(proposals_path)
   end
 
   scenario 'Responsible name is stored for anonymous users' do

From 1d93207744b086d760769b922684712c6e351925 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 28 Apr 2016 11:12:07 +0200
Subject: [PATCH 11/15] uses invisible_captcha 0.8.2

---
 Gemfile      |  2 +-
 Gemfile.lock | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index a711c8f07..aa5c4b130 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'foundation-rails'
 gem 'foundation_rails_helper'
 gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.1.5'
-gem 'invisible_captcha', git: 'https://github.com/markets/invisible_captcha'
+gem 'invisible_captcha', '~> 0.8.2'
 gem 'cancancan'
 gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
 gem 'initialjs-rails', '0.2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index bd451c38f..7c2b53703 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,13 +7,6 @@ GIT
       coffee-rails
       sass-rails
 
-GIT
-  remote: https://github.com/markets/invisible_captcha
-  revision: 344ce197b8e0761c037fd70a9937ce5e2f22f80a
-  specs:
-    invisible_captcha (0.8.1)
-      rails
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -209,6 +202,8 @@ GEM
       terminal-table (>= 1.5.1)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
+    invisible_captcha (0.8.2)
+      rails
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -474,7 +469,7 @@ DEPENDENCIES
   groupdate
   i18n-tasks
   initialjs-rails (= 0.2.0.1)
-  invisible_captcha!
+  invisible_captcha (~> 0.8.2)
   jquery-rails
   jquery-ui-rails
   kaminari

From 8bcbe8606420bd3fd990f490ceaf43e8d740741d Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 28 Apr 2016 12:46:27 +0200
Subject: [PATCH 12/15] Refactor layout flash usage and move to a partial

---
 app/views/layouts/_flash.html.erb      | 10 ++++++++++
 app/views/layouts/admin.html.erb       | 17 +----------------
 app/views/layouts/application.html.erb | 22 +---------------------
 app/views/layouts/devise.html.erb      | 19 ++-----------------
 app/views/layouts/management.html.erb  | 17 +----------------
 5 files changed, 15 insertions(+), 70 deletions(-)
 create mode 100644 app/views/layouts/_flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
new file mode 100644
index 000000000..d07259c5c
--- /dev/null
+++ b/app/views/layouts/_flash.html.erb
@@ -0,0 +1,10 @@
+<% flash.each do |flash_key, flash_message| %>
+  <div id="<%= flash_key %>" data-alert class="row" data-closable>
+    <div class="callout <%= flash_key %>">
+      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <%= flash_message %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index d34195915..cc8e0c4a9 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -23,23 +23,8 @@
         </div>
 
         <div class="admin-content small-12 medium-9 column">
-          <% if notice %>
-            <div data-alert class="callout success" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= notice %>
-            </div>
-          <% end %>
 
-          <% if alert %>
-            <div data-alert class="callout alert" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= alert %>
-            </div>
-          <% end %>
+          <%= render 'layouts/flash' %>
 
           <%= yield %>
         </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ea4fcb107..269764328 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -42,27 +42,7 @@
       <% end %>
       <![endif]-->
 
-      <% if notice %>
-      <div id="notice" data-alert class="row" data-closable>
-        <div class="callout success">
-          <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-          <%= notice %>
-        </div>
-      </div>
-      <% end %>
-
-      <% if alert %>
-      <div id="alert" data-alert class="row" data-closable>
-        <div class="callout alert">
-          <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-          <%= alert %>
-        </div>
-      </div>
-      <% end %>
+      <%= render 'layouts/flash' %>
 
       <%= yield %>
       <div class="push"></div>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 4ef57dc4f..b3599fc0f 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -27,23 +27,8 @@
       <div class="row auth">
         <main>
           <div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom">
-            <% if notice %>
-              <div data-alert class="callout success" data-closable>
-                <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                  <span aria-hidden="true">&times;</span>
-                </button>
-                <%= notice %>
-              </div>
-            <% end %>
 
-            <% if alert %>
-              <div data-alert class="callout warning" data-closable>
-                <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                  <span aria-hidden="true">&times;</span>
-                </button>
-                <%= alert %>
-              </div>
-            <% end %>
+            <%= render 'layouts/flash' %>
 
             <%= yield %>
           </div>
@@ -56,4 +41,4 @@
       <%= render 'layouts/footer' %>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index b79cb5f41..735175155 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -54,23 +54,8 @@
         <%= render "management/account_info" %>
 
         <div class="admin-content small-12 medium-9 column">
-          <% if notice %>
-            <div data-alert class="callout success" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= notice %>
-            </div>
-          <% end %>
 
-          <% if alert %>
-            <div data-alert class="callout alert" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= alert %>
-            </div>
-          <% end %>
+          <%= render 'layouts/flash' %>
 
           <%= yield %>
         </div>

From 9ac6e2d60b0119ad37105856acb31c198b97e9cf Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 28 Apr 2016 12:47:04 +0200
Subject: [PATCH 13/15] Uses invisible_captcha's default "foo fast" action

---
 app/controllers/application_controller.rb                 | 4 ----
 app/controllers/debates_controller.rb                     | 2 +-
 app/controllers/organizations/registrations_controller.rb | 2 +-
 app/controllers/proposals_controller.rb                   | 2 +-
 app/controllers/spending_proposals_controller.rb          | 2 +-
 app/controllers/users/registrations_controller.rb         | 2 +-
 spec/features/debates_spec.rb                             | 2 +-
 spec/features/organizations_spec.rb                       | 2 +-
 spec/features/proposals_spec.rb                           | 2 +-
 spec/features/registration_form_spec.rb                   | 2 +-
 spec/features/spending_proposals_spec.rb                  | 2 +-
 11 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 224ff26eb..3e1b78d31 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -114,8 +114,4 @@ class ApplicationController < ActionController::Base
         store_location_for(:user, request.path)
       end
     end
-
-    def redirect_timestamp_spam
-      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
-    end
 end
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 67f40ce6c..e077e5e8a 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -11,7 +11,7 @@ class DebatesController < ApplicationController
 
   feature_flag :debates
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
 
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index 29d45a108..503c26bc0 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -1,6 +1,6 @@
 class Organizations::RegistrationsController < Devise::RegistrationsController
 
-  invisible_captcha only: [:create], honeypot: :address, scope: :user, on_timestamp_spam: :redirect_timestamp_spam
+  invisible_captcha only: [:create], honeypot: :address, scope: :user
 
   def new
     super do |user|
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 78b6977c8..2c349bd60 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -11,7 +11,7 @@ class ProposalsController < ApplicationController
   before_action :load_geozones, only: [:edit, :map, :summary]
   before_action :authenticate_user!, except: [:index, :show, :map, :summary]
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
 
   has_orders %w{hot_score confidence_score created_at relevance}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index 870e32814..3f590f414 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -8,7 +8,7 @@ class SpendingProposalsController < ApplicationController
 
   feature_flag :spending_proposals
 
-  invisible_captcha only: [:create, :update], honeypot: :subtitle, on_timestamp_spam: :redirect_timestamp_spam
+  invisible_captcha only: [:create, :update], honeypot: :subtitle
 
   respond_to :html, :js
 
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 0c1e067fb..2b25a5126 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -1,7 +1,7 @@
 class Users::RegistrationsController < Devise::RegistrationsController
   prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy, :finish_signup, :do_finish_signup]
 
-  invisible_captcha only: [:create], honeypot: :family_name, scope: :user, on_timestamp_spam: :redirect_timestamp_spam
+  invisible_captcha only: [:create], honeypot: :family_name, scope: :user
 
   def new
     super do |user|
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 3c88b1a95..d20c1c302 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -139,7 +139,7 @@ feature 'Debates' do
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
 
-    expect(current_path).to eq(proposals_path)
+    expect(current_path).to eq(new_debate_path)
   end
 
   scenario 'Errors on create' do
diff --git a/spec/features/organizations_spec.rb b/spec/features/organizations_spec.rb
index 3a84d7adf..0a7a2bcc7 100644
--- a/spec/features/organizations_spec.rb
+++ b/spec/features/organizations_spec.rb
@@ -55,7 +55,7 @@ feature 'Organizations' do
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
 
-    expect(current_path).to eq(root_path)
+    expect(current_path).to eq(new_organization_registration_path)
   end
 
   scenario 'Errors on create' do
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index c5a202543..c7be4956b 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -185,7 +185,7 @@ feature 'Proposals' do
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
 
-    expect(current_path).to eq(proposals_path)
+    expect(current_path).to eq(new_proposal_path)
   end
 
   scenario 'Responsible name is stored for anonymous users' do
diff --git a/spec/features/registration_form_spec.rb b/spec/features/registration_form_spec.rb
index 42a5645dc..4f258e601 100644
--- a/spec/features/registration_form_spec.rb
+++ b/spec/features/registration_form_spec.rb
@@ -75,7 +75,7 @@ feature 'Registration form' do
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
 
-    expect(current_path).to eq(root_path)
+    expect(current_path).to eq(new_user_registration_path)
   end
 
 
diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb
index 392a3f56f..8b52bd014 100644
--- a/spec/features/spending_proposals_spec.rb
+++ b/spec/features/spending_proposals_spec.rb
@@ -141,7 +141,7 @@ feature 'Spending proposals' do
     click_button 'Create'
 
     expect(page).to have_content 'Sorry, that was too quick! Please resubmit'
-    expect(current_path).to eq(proposals_path)
+    expect(current_path).to eq(new_spending_proposal_path)
   end
 
   scenario 'Create notice' do

From 6c9c2f1b964c238871ba3f46ac44ae5c452ab961 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 28 Apr 2016 14:00:20 +0200
Subject: [PATCH 14/15] removes obsolete/deprecated code

---
 app/controllers/proposals_controller.rb | 4 ----
 config/locales/en.yml                   | 1 -
 config/locales/es.yml                   | 1 -
 3 files changed, 6 deletions(-)

diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 2c349bd60..0b350f687 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -97,8 +97,4 @@ class ProposalsController < ApplicationController
       end
     end
 
-    def redirect_timestamp_spam
-      redirect_to root_path, notice: InvisibleCaptcha.timestamp_error_message
-    end
-
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 57dcb4e87..118207f27 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -584,6 +584,5 @@ en:
       alt: "Select the text you want to comment and press the button with the pencil."
   invisible_captcha:
     sentence_for_humans: "If you are human, ignore this field"
-    error_message: "Robot activity detected"
     timestamp_error_message: "Sorry, that was too quick! Please resubmit."
 
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9623bcb54..81dbe56fc 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -584,5 +584,4 @@ es:
       alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz."
   invisible_captcha:
     sentence_for_humans: "Si eres humano, por favor ignora este campo"
-    error_message: "Eres un robot!"
     timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."

From e441a6805fa83abc305ca2e3d5f33c3dea1fb2d6 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 28 Apr 2016 16:21:51 +0200
Subject: [PATCH 15/15] makes callout.notice and callout.error equivalent to
 success, alert

---
 app/assets/stylesheets/layout.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 030041769..d59b33b5e 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -755,7 +755,7 @@ form {
   font-family: $font-sans;
   font-size: $small-font-size;
 
-  &.success {
+  &.success, &.notice {
     background-color: $success-bg;
     border-color: $success-border;
     color: $success-color;
@@ -779,7 +779,7 @@ form {
     }
   }
 
-  &.alert {
+  &.alert, &.error {
     background-color: $alert-bg;
     border-color: $alert-border;
     color: $alert-color;