From cf8bc486e4321b2b8d49d759ccbbeea4642a5baf Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 31 May 2017 12:51:01 +0200 Subject: [PATCH] Rename proposal_improvement_url to proposal_improvement_path to truly describe the value that the variable holds --- app/controllers/proposals_controller.rb | 4 ++-- config/locales/settings.en.yml | 2 +- config/locales/settings.es.yml | 2 +- db/dev_seeds.rb | 2 +- db/seeds.rb | 2 +- spec/features/proposals_spec.rb | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 8aa9fd0e6..3a9db4c5d 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -56,8 +56,8 @@ class ProposalsController < ApplicationController end def share - if Setting['proposal_improvement_url'].present? - @proposal_improvement_url = root_url + Setting['proposal_improvement_url'] + if Setting['proposal_improvement_path'].present? + @proposal_improvement_url = root_url + Setting['proposal_improvement_path'] end end diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml index b7b7dbf71..4494e95fc 100755 --- a/config/locales/settings.en.yml +++ b/config/locales/settings.en.yml @@ -44,4 +44,4 @@ en: meta_keywords: "Keywords (SEO)" verification_offices_url: Verification offices URL min_age_to_participate: Minimum age needed to participate - proposal_improvement_url: Proposal improvement info internal link + proposal_improvement_path: Proposal improvement info internal link diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml index 4fdce8766..7b62dd564 100644 --- a/config/locales/settings.es.yml +++ b/config/locales/settings.es.yml @@ -44,4 +44,4 @@ es: meta_keywords: "Palabras clave (SEO)" verification_offices_url: URL oficinas verificación min_age_to_participate: Edad mínima para participar - proposal_improvement_url: Link a información para mejorar propuestas + proposal_improvement_path: Link a información para mejorar propuestas diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 945059c8f..dab9a713f 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -44,7 +44,7 @@ Setting.create(key: 'meta_description', value: 'Citizen Participation and Open G Setting.create(key: 'meta_keywords', value: 'citizen participation, open government') Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/') Setting.create(key: 'min_age_to_participate', value: '16') -Setting.create(key: 'proposal_improvement_url', value: nil) +Setting.create(key: 'proposal_improvement_path', value: nil) puts " ✅" print "Creating Geozones" diff --git a/db/seeds.rb b/db/seeds.rb index 4bcce8eca..6621feb22 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -105,4 +105,4 @@ Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/' Setting['min_age_to_participate'] = 16 # Proposal improvement url path ('more-information/proposal-improvement') -Setting['proposal_improvement_url'] = nil +Setting['proposal_improvement_path'] = nil diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index fd10208a3..bc0ed7f49 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -157,7 +157,7 @@ feature 'Proposals' do end scenario 'Create with proposal improvement info link' do - Setting['proposal_improvement_url'] = 'more-information/proposal-improvement' + Setting['proposal_improvement_path'] = 'more-information/proposal-improvement' author = create(:user) login_as(author) @@ -181,7 +181,7 @@ feature 'Proposals' do expect(page).to have_content 'Help refugees' - Setting['proposal_improvement_url'] = nil + Setting['proposal_improvement_path'] = nil end scenario 'Create with invisible_captcha honeypot field' do