From c22ac0086b99e706890ad40f439e9b5bae0cf65e Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 17 Sep 2018 13:53:19 +0100 Subject: [PATCH] Moved cookies_policy_helper to Web engine and respective spec --- app/helpers/cookies_policy_helper.rb | 21 -------- .../app/helpers/web/cookies_policy_helper.rb | 23 ++++++++ .../helpers/cookies_policy_helper_spec.rb | 52 +++++++++++++++++++ spec/helpers/cookies_policy_helper_spec.rb | 51 ------------------ 4 files changed, 75 insertions(+), 72 deletions(-) delete mode 100644 app/helpers/cookies_policy_helper.rb create mode 100644 engines/web/app/helpers/web/cookies_policy_helper.rb create mode 100644 engines/web/spec/helpers/cookies_policy_helper_spec.rb delete mode 100644 spec/helpers/cookies_policy_helper_spec.rb diff --git a/app/helpers/cookies_policy_helper.rb b/app/helpers/cookies_policy_helper.rb deleted file mode 100644 index 5bcec92383..0000000000 --- a/app/helpers/cookies_policy_helper.rb +++ /dev/null @@ -1,21 +0,0 @@ -module CookiesPolicyHelper - def render_cookie_entry(cookie_name, cookie_desc, cookie_domain = nil) - render partial: 'cookies_policy_entry', - locals: { cookie_name: cookie_name, - cookie_desc: cookie_desc, - cookie_domain: cookie_domain } - end - - def matomo_iframe_src - "#{Spree::Config.matomo_url}"\ - "/index.php?module=CoreAdminHome&action=optOut"\ - "&language=#{locale_language}"\ - "&backgroundColor=&fontColor=222222&fontSize=16px&fontFamily=%22Roboto%22%2C%20Arial%2C%20sans-serif" - end - - # removes country from locale if needed - # for example, both locales en and en_GB return language en - def locale_language - I18n.locale[0..1] - end -end diff --git a/engines/web/app/helpers/web/cookies_policy_helper.rb b/engines/web/app/helpers/web/cookies_policy_helper.rb new file mode 100644 index 0000000000..0fb86f7793 --- /dev/null +++ b/engines/web/app/helpers/web/cookies_policy_helper.rb @@ -0,0 +1,23 @@ +module Web + module CookiesPolicyHelper + def render_cookie_entry(cookie_name, cookie_desc, cookie_domain = nil) + render partial: 'cookies_policy_entry', + locals: { cookie_name: cookie_name, + cookie_desc: cookie_desc, + cookie_domain: cookie_domain } + end + + def matomo_iframe_src + "#{Spree::Config.matomo_url}"\ + "/index.php?module=CoreAdminome&action=optOut"\ + "&language=#{locale_language}"\ + "&backgroundColor=&fontColor=222222&fontSize=16px&fontFamily=%22Roboto%22%2C%20Arial%2C%20sans-serif" + end + + # removes country from locale if needed + # for example, both locales en and en_GB return language en + def locale_language + I18n.locale[0..1] + end + end +end diff --git a/engines/web/spec/helpers/cookies_policy_helper_spec.rb b/engines/web/spec/helpers/cookies_policy_helper_spec.rb new file mode 100644 index 0000000000..b4d7f7fdf3 --- /dev/null +++ b/engines/web/spec/helpers/cookies_policy_helper_spec.rb @@ -0,0 +1,52 @@ +require 'spec_helper' + +module Web + describe CookiesPolicyHelper, type: :helper do + # keeps global state unchanged + around do |example| + original_locale = I18n.locale + original_matomo_url = Spree::Config.matomo_url + example.run + Spree::Config.matomo_url = original_matomo_url + I18n.locale = original_locale + end + + describe "matomo optout iframe src" do + describe "when matomo url is set" do + before do + Spree::Config.matomo_url = "http://matomo.org/" + end + + scenario "includes the matomo URL" do + expect(helper.matomo_iframe_src).to include Spree::Config.matomo_url + end + + scenario "is not equal to the matomo URL" do + expect(helper.matomo_iframe_src).to_not eq Spree::Config.matomo_url + end + end + + scenario "is not nil, when matomo url is nil" do + Spree::Config.matomo_url = nil + expect(helper.matomo_iframe_src).to_not eq nil + end + end + + describe "language from locale" do + scenario "when locale is the language" do + I18n.locale = "en" + expect(helper.locale_language).to eq "en" + end + + scenario "is empty when locale is empty" do + I18n.locale = "" + expect(helper.locale_language).to be_empty + end + + scenario "is only the language, when locale includes country" do + I18n.locale = "en_GB" + expect(helper.locale_language).to eq "en" + end + end + end +end diff --git a/spec/helpers/cookies_policy_helper_spec.rb b/spec/helpers/cookies_policy_helper_spec.rb deleted file mode 100644 index b09f578a32..0000000000 --- a/spec/helpers/cookies_policy_helper_spec.rb +++ /dev/null @@ -1,51 +0,0 @@ -require 'spec_helper' - -describe CookiesPolicyHelper, type: :helper do - - # keeps global state unchanged - around do |example| - original_locale = I18n.locale - original_matomo_url = Spree::Config.matomo_url - example.run - Spree::Config.matomo_url = original_matomo_url - I18n.locale = original_locale - end - - describe "matomo optout iframe src" do - describe "when matomo url is set" do - before do - Spree::Config.matomo_url = "http://matomo.org/" - end - - scenario "includes the matomo URL" do - expect(helper.matomo_iframe_src).to include Spree::Config.matomo_url - end - - scenario "is not equal to the matomo URL" do - expect(helper.matomo_iframe_src).to_not eq Spree::Config.matomo_url - end - end - - scenario "is not nil, when matomo url is nil" do - Spree::Config.matomo_url = nil - expect(helper.matomo_iframe_src).to_not eq nil - end - end - - describe "language from locale" do - scenario "when locale is the language" do - I18n.locale = "en" - expect(helper.locale_language).to eq "en" - end - - scenario "is empty when locale is empty" do - I18n.locale = "" - expect(helper.locale_language).to be_empty - end - - scenario "is only the language, when locale includes country" do - I18n.locale = "en_GB" - expect(helper.locale_language).to eq "en" - end - end -end