From 388bcc50376a639232e7f89de79a08dced42243d Mon Sep 17 00:00:00 2001 From: Mateusz Grotek Date: Thu, 18 Jan 2024 11:04:14 +0000 Subject: [PATCH 1/2] Revert "Merge pull request #3912 from alphagov/prep-links-for-a-b-testing" This reverts commit c1ea63c553a4b6f6ff8f050f21602fdc261c6bd5, reversing changes made to f886eb16523efa9ff10f085c3eafdb7ae33f5632. --- app/views/homepage/_popular_links.html.erb | 8 ++--- config/locales/cy.yml | 3 -- config/locales/en.yml | 39 ---------------------- test/integration/homepage_test.rb | 6 ++-- 4 files changed, 7 insertions(+), 49 deletions(-) diff --git a/app/views/homepage/_popular_links.html.erb b/app/views/homepage/_popular_links.html.erb index 8b15b10d8a..4b4beab2c9 100644 --- a/app/views/homepage/_popular_links.html.erb +++ b/app/views/homepage/_popular_links.html.erb @@ -3,11 +3,11 @@ %> <% if variant_b_page? %> - <% popular_links = t("homepage.index.popular_links_b") %> + <% popular_links = t("homepage.index.popular_links") %> <% elsif variant_c_page? %> - <% popular_links = t("homepage.index.popular_links_c") %> + <% popular_links = t("homepage.index.popular_links") %> <% elsif variant_d_page? %> - <% popular_links = t("homepage.index.popular_links_d") %> + <% popular_links = t("homepage.index.popular_links") %> <% else %> <% popular_links = t("homepage.index.popular_links") %> <% end %> @@ -41,7 +41,7 @@ 'index_section': locals[:index_section], 'index_link': index + 1, 'index_section_count': locals[:index_section_count], - 'index_total': popular_links.length, + 'index_total': t("homepage.index.popular_links").length, 'section': "#{t("homepage.index.popular_links_heading", locale: :en)}" } } diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 2801d07345..db060b35da 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -931,9 +931,6 @@ cy: more: popular_links_heading: popular_links: - popular_links_b: - popular_links_c: - popular_links_d: more_links: other_agencies: other_agencies_count: diff --git a/config/locales/en.yml b/config/locales/en.yml index d31e53d253..9acbfa6664 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -581,45 +581,6 @@ en: href: /check-national-insurance-record - text: 'Check MOT history of a vehicle' href: /check-mot-history - popular_links_b: - - text: 'Universal Credit account: sign in' - href: /sign-in-universal-credit - - text: 'Check MOT history of a vehicle' - href: /check-mot-history - - text: 'HMRC online services: sign in or set up an account' - href: /log-in-register-hmrc-online-services - - text: 'Get information about a company' - href: /get-information-about-a-company - - text: 'Tax your vehicle' - href: /vehicle-tax - - text: 'Check if a vehicle is taxed' - href: /check-vehicle-tax - popular_links_c: - - text: 'HMRC online services: sign in or set up an account' - href: /log-in-register-hmrc-online-services - - text: 'Check your State Pension forecast' - href: /check-state-pension - - text: 'Personal tax account: sign in or set up' - href: /personal-tax-account - - text: 'Sign in to your childcare account' - href: /sign-in-childcare-account - - text: 'File your Self Assessment tax return online' - href: /log-in-file-self-assessment-tax-return - - text: 'Universal Credit account: sign in' - href: /sign-in-universal-credit - popular_links_d: - - text: 'Change your driving test appointment' - href: /change-driving-test - - text: 'Book your driving test' - href: /book-driving-test - - text: 'Universal Credit account: sign in' - href: /sign-in-universal-credit - - text: 'HMRC online services: sign in or set up an account' - href: /log-in-register-hmrc-online-services - - text: 'Find an energy certificate' - href: /find-energy-certificate - - text: 'Student finance login' - href: /student-finance-register-login # If adding or removing items remember to update the `columns()` mixin in # the homepage-most-active-list class in _homepage.scss. more_links: diff --git a/test/integration/homepage_test.rb b/test/integration/homepage_test.rb index af30976fbf..71d7cb22d2 100644 --- a/test/integration/homepage_test.rb +++ b/test/integration/homepage_test.rb @@ -46,7 +46,7 @@ class HomepageTest < ActionDispatch::IntegrationTest should "have different links for the B variant" do with_variant HomepagePopularLinksTest: "B" do visit "/" - assert page.has_text?("Get information about a company") + assert page.has_text?("Find out about help you can get with your energy bills") end end @@ -67,14 +67,14 @@ class HomepageTest < ActionDispatch::IntegrationTest should "have different links for the C variant" do with_variant HomepagePopularLinksTest: "C" do visit "/" - assert page.has_text?("Sign in to your childcare account") + assert page.has_text?("Find out about help you can get with your energy bills") end end should "have different links for the D variant" do with_variant HomepagePopularLinksTest: "D" do visit "/" - assert page.has_text?("Find an energy certificate") + assert page.has_text?("Find out about help you can get with your energy bills") end end end From 449ebd386c30454a39b103b0938eb3b7c31d12a4 Mon Sep 17 00:00:00 2001 From: Mateusz Grotek Date: Thu, 18 Jan 2024 11:06:42 +0000 Subject: [PATCH 2/2] Revert "Merge pull request #3865 from alphagov/add-ab-testing-to-homepage" This reverts commit e4f9ff30c357f7c200e4e7aae2a90c1fade7a05a, reversing changes made to e2d3da650935ea4e2ed88d2318bc8df2b1dab808. --- .../homepage_popular_links_ab_testable.rb | 49 ------------------- app/controllers/homepage_controller.rb | 2 - app/views/homepage/_popular_links.html.erb | 12 +---- app/views/homepage/index.html.erb | 1 - test/integration/homepage_test.rb | 39 --------------- 5 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 app/controllers/concerns/homepage_popular_links_ab_testable.rb diff --git a/app/controllers/concerns/homepage_popular_links_ab_testable.rb b/app/controllers/concerns/homepage_popular_links_ab_testable.rb deleted file mode 100644 index ba315c9b7a..0000000000 --- a/app/controllers/concerns/homepage_popular_links_ab_testable.rb +++ /dev/null @@ -1,49 +0,0 @@ -module HomepagePopularLinksAbTestable - CUSTOM_DIMENSION = 67 - - ALLOWED_VARIANTS = %w[A B C D Z].freeze - - def self.included(base) - base.helper_method( - :homepage_popular_links_ab_test_variant, - :page_under_test?, - :variant_b_page?, - :variant_c_page?, - :variant_d_page?, - ) - base.after_action :set_homepage_popular_links_test_response_header - end - - def homepage_popular_links_test - @homepage_popular_links_test ||= GovukAbTesting::AbTest.new( - "HomepagePopularLinksTest", - dimension: CUSTOM_DIMENSION, - allowed_variants: ALLOWED_VARIANTS, - control_variant: "Z", - ) - end - - def homepage_popular_links_ab_test_variant - @homepage_popular_links_ab_test_variant ||= homepage_popular_links_test.requested_variant(request.headers) - end - - def set_homepage_popular_links_test_response_header - homepage_popular_links_ab_test_variant.configure_response(response) if page_under_test? - end - - def variant_b_page? - page_under_test? && homepage_popular_links_ab_test_variant.variant?("B") - end - - def variant_c_page? - page_under_test? && homepage_popular_links_ab_test_variant.variant?("C") - end - - def variant_d_page? - page_under_test? && homepage_popular_links_ab_test_variant.variant?("D") - end - - def page_under_test? - request.path == "/" - end -end diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb index c0031396da..400fc9d6c6 100644 --- a/app/controllers/homepage_controller.rb +++ b/app/controllers/homepage_controller.rb @@ -1,7 +1,5 @@ class HomepageController < ContentItemsController include Cacheable - include HomepagePopularLinksAbTestable - slimmer_template "gem_layout_homepage" def index diff --git a/app/views/homepage/_popular_links.html.erb b/app/views/homepage/_popular_links.html.erb index 4b4beab2c9..8e4fef7d57 100644 --- a/app/views/homepage/_popular_links.html.erb +++ b/app/views/homepage/_popular_links.html.erb @@ -2,16 +2,6 @@ add_view_stylesheet("popular_links") %> -<% if variant_b_page? %> - <% popular_links = t("homepage.index.popular_links") %> -<% elsif variant_c_page? %> - <% popular_links = t("homepage.index.popular_links") %> -<% elsif variant_d_page? %> - <% popular_links = t("homepage.index.popular_links") %> -<% else %> - <% popular_links = t("homepage.index.popular_links") %> -<% end %> -
@@ -22,7 +12,7 @@ text: t("homepage.index.popular_links_heading"), } %>
    - <% popular_links.each_with_index do | item, index | %> + <% t("homepage.index.popular_links").each_with_index do | item, index | %>
  • <%= render "govuk_publishing_components/components/action_link", { text: item[:text], diff --git a/app/views/homepage/index.html.erb b/app/views/homepage/index.html.erb index d0610ca692..6a7990bae7 100644 --- a/app/views/homepage/index.html.erb +++ b/app/views/homepage/index.html.erb @@ -1,6 +1,5 @@ <% add_view_stylesheet("homepage")%> <% content_for :extra_headers do %> - <%= homepage_popular_links_ab_test_variant.analytics_meta_tag.html_safe if page_under_test? %> "> <% end %> diff --git a/test/integration/homepage_test.rb b/test/integration/homepage_test.rb index 71d7cb22d2..1ea810f255 100644 --- a/test/integration/homepage_test.rb +++ b/test/integration/homepage_test.rb @@ -1,8 +1,6 @@ require "integration_test_helper" class HomepageTest < ActionDispatch::IntegrationTest - include GovukAbTesting::MinitestHelpers - setup do stub_content_store_has_item("/", schema: "special_route") end @@ -41,41 +39,4 @@ class HomepageTest < ActionDispatch::IntegrationTest assert page.has_content?(I18n.t("homepage.index.government_activity_description", locale: :en)) end end - - context "when AB testing different popular links" do - should "have different links for the B variant" do - with_variant HomepagePopularLinksTest: "B" do - visit "/" - assert page.has_text?("Find out about help you can get with your energy bills") - end - end - - should "have different links for the A variant" do - with_variant HomepagePopularLinksTest: "A" do - visit "/" - assert page.has_text?("Find out about help you can get with your energy bills") - end - end - - should "have different links for the Z variant" do - with_variant HomepagePopularLinksTest: "Z" do - visit "/" - assert page.has_text?("Find out about help you can get with your energy bills") - end - end - - should "have different links for the C variant" do - with_variant HomepagePopularLinksTest: "C" do - visit "/" - assert page.has_text?("Find out about help you can get with your energy bills") - end - end - - should "have different links for the D variant" do - with_variant HomepagePopularLinksTest: "D" do - visit "/" - assert page.has_text?("Find out about help you can get with your energy bills") - end - end - end end