From f4f0593fda3baa5d2ada01193025f2609428af62 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 28 Jul 2015 12:39:39 +0200 Subject: [PATCH] displays captcha only on new, not edit --- app/helpers/recaptcha_helper.rb | 4 ++++ app/views/shared/_captcha.html.erb | 2 +- spec/helpers/recaptcha_helper_spec.rb | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/helpers/recaptcha_helper.rb b/app/helpers/recaptcha_helper.rb index 9e6fa90e6..2e2a9a757 100644 --- a/app/helpers/recaptcha_helper.rb +++ b/app/helpers/recaptcha_helper.rb @@ -1,4 +1,8 @@ module RecaptchaHelper + + def recaptchable? + @debate.new_record? + end def recaptcha_keys? Recaptcha.configuration.public_key.present? && diff --git a/app/views/shared/_captcha.html.erb b/app/views/shared/_captcha.html.erb index 7200bf6da..676cc0444 100644 --- a/app/views/shared/_captcha.html.erb +++ b/app/views/shared/_captcha.html.erb @@ -1,3 +1,3 @@ -<% if recaptcha_keys? %> +<% if recaptchable? and recaptcha_keys? %> <%= recaptcha_tags ajax: true, hl: I18n.locale %> <% end %> \ No newline at end of file diff --git a/spec/helpers/recaptcha_helper_spec.rb b/spec/helpers/recaptcha_helper_spec.rb index 545e9e827..f2fe651e5 100644 --- a/spec/helpers/recaptcha_helper_spec.rb +++ b/spec/helpers/recaptcha_helper_spec.rb @@ -2,6 +2,20 @@ require 'rails_helper' describe RecaptchaHelper do + describe '#recaptchable?' do + + it 'should be true if new record' do + assign(:debate, build(:debate)) + expect(helper.recaptchable?).to be true + end + + it 'should be false if existing record' do + assign(:debate, create(:debate)) + expect(helper.recaptchable?).to be false + end + + end + describe "#recaptcha_keys?" do it "should be true if Recaptcha keys are configured" do