diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ef20b6cb4..501a6835b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,8 +3,6 @@ class ApplicationController < ActionController::Base # For APIs, you may want to use :null_session instead. protect_from_forgery except: :service_sign_in_options - include ABTestable - private def content_item_path diff --git a/app/controllers/concerns/ab_testable.rb b/app/controllers/concerns/ab_testable.rb deleted file mode 100644 index f91753667..000000000 --- a/app/controllers/concerns/ab_testable.rb +++ /dev/null @@ -1,29 +0,0 @@ -module ABTestable - RELATED_LINKS_DIMENSION = 65 - - def self.included(base) - base.helper_method( - :related_links_variant - ) - base.after_action :set_test_response_header - end - - def related_links_variant - @related_links_variant ||= related_links_test.requested_variant(request.headers) - end - -private - - def related_links_test - @related_links_test ||= GovukAbTesting::AbTest.new( - "RelatedLinksABTest4", - dimension: RELATED_LINKS_DIMENSION, - allowed_variants: %w(A B C), - control_variant: "A" - ) - end - - def set_test_response_header - related_links_variant.configure_response(response) - end -end diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb index c250a593b..a3d0eb42d 100644 --- a/app/controllers/content_items_controller.rb +++ b/app/controllers/content_items_controller.rb @@ -56,11 +56,6 @@ def set_guide_draft_access_token def load_content_item content_item = Services.content_store.content_item(content_item_path) - - if related_links_variant.variant?('C') && content_item.dig('links') - content_item['links']['ordered_related_items'] = content_item['links'].fetch('suggested_ordered_related_items', []) - end - @content_item = PresenterBuilder.new(content_item, content_item_path).presenter end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 22f9fc0b2..282739496 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,8 +21,6 @@ <%= csrf_meta_tags %> <%= render 'govuk_publishing_components/components/meta_tags', content_item: @content_item.content_item %> - <%= related_links_variant.analytics_meta_tag.html_safe %> - <% if @content_item.description %> <% end %> diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb index 49a974dab..12d5a4e16 100644 --- a/test/controllers/content_items_controller_test.rb +++ b/test/controllers/content_items_controller_test.rb @@ -130,46 +130,6 @@ class ContentItemsControllerTest < ActionController::TestCase assert_equal content_item['title'], assigns[:content_item].title end - test "gets item from the content store and keeps ordered_related_items when running RelatedLinksABTest4 misclassification variant" do - with_variant RelatedLinksABTest4: 'A' do - content_item = content_store_has_schema_example('case_study', 'case_study') - - get :show, params: { path: path_for(content_item) } - assert_response :success - assert_equal content_item['links']['ordered_related_items'], assigns[:content_item].content_item['links']['ordered_related_items'] - end - end - - test "gets item from the content store and keeps ordered_related_items when running RelatedLinksABTest4 control variant" do - with_variant RelatedLinksABTest4: 'B' do - content_item = content_store_has_schema_example('case_study', 'case_study') - - get :show, params: { path: path_for(content_item) } - assert_response :success - assert_equal content_item['links']['ordered_related_items'], assigns[:content_item].content_item['links']['ordered_related_items'] - end - end - - test "gets item from the content store and replaces ordered_related_items when running RelatedLinksABTest4 test variant" do - with_variant RelatedLinksABTest4: 'C' do - content_item = content_store_has_schema_example('case_study', 'case_study') - - get :show, params: { path: path_for(content_item) } - assert_response :success - assert_equal assigns[:content_item].content_item['links']['ordered_related_items'], assigns[:content_item].content_item['links']['suggested_ordered_related_items'] - end - end - - test "gets item from the content store and replaces ordered_related_items when empty array when RelatedLinksABTest4 test variant has no suggestions" do - with_variant RelatedLinksABTest4: 'C' do - content_item = content_store_has_schema_example('guide', 'guide') - - get :show, params: { path: path_for(content_item) } - assert_response :success - assert_equal [], assigns[:content_item].content_item['links']['ordered_related_items'] - end - end - test "sets the expiry as sent by content-store" do content_item = content_store_has_schema_example('coming_soon', 'coming_soon') content_store_has_item(content_item['base_path'], content_item, max_age: 20) diff --git a/test/controllers/development_controller_test.rb b/test/controllers/development_controller_test.rb deleted file mode 100644 index 983e0e56d..000000000 --- a/test/controllers/development_controller_test.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'test_helper' - -class DevelopmentControllerTest < ActionController::TestCase - include GovukAbTesting::MinitestHelpers - - %w(A B C).each do |test_variant| - test "RelatedLinksABTest4 works correctly for each variant (variant: #{test_variant})" do - with_variant RelatedLinksABTest4: test_variant do - get :index - - ab_test = @controller.send(:related_links_test) - requested = ab_test.requested_variant(request.headers) - assert requested.variant?(test_variant) - end - end - end -end