diff --git a/app/helpers/recruitment_banner_helper.rb b/app/helpers/recruitment_banner_helper.rb deleted file mode 100644 index a047c9281..000000000 --- a/app/helpers/recruitment_banner_helper.rb +++ /dev/null @@ -1,17 +0,0 @@ -module RecruitmentBannerHelper - SURVERY_URL = "https://surveys.publishing.service.gov.uk/s/SNFVW1/".freeze - - SURVEY_URL_MAPPINGS = { - "/browse/tax" => SURVERY_URL, - "/browse/tax/self-assessment" => SURVERY_URL, - "/topic/personal-tax/self-assessment" => SURVERY_URL, - }.freeze - - def recruitment_survey_url - user_research_test_url - end - - def user_research_test_url - SURVEY_URL_MAPPINGS[base_path] - end -end diff --git a/app/models/mainstream_browse_page.rb b/app/models/mainstream_browse_page.rb index 4312d3289..56a773147 100644 --- a/app/models/mainstream_browse_page.rb +++ b/app/models/mainstream_browse_page.rb @@ -1,6 +1,4 @@ class MainstreamBrowsePage - include RecruitmentBannerHelper - attr_reader :content_item delegate( diff --git a/app/models/topic.rb b/app/models/topic.rb index 8833ef72c..8f9b4cc21 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -1,6 +1,4 @@ class Topic - include RecruitmentBannerHelper - attr_reader :content_item delegate( diff --git a/app/views/browse/show.html.erb b/app/views/browse/show.html.erb index e9dd42b80..ffc0a5a73 100644 --- a/app/views/browse/show.html.erb +++ b/app/views/browse/show.html.erb @@ -20,7 +20,7 @@ } %> <% end %> -<%= render "shared/browse_header", { margin_bottom: page.slug == "benefits" || page.recruitment_survey_url ? 7 : 9 } do %> +<%= render "shared/browse_header", { margin_bottom: page.slug == "benefits" ? 7 : 9 } do %>

<%= page.title %>

@@ -31,17 +31,6 @@ } %> <% end %> -<% if page.recruitment_survey_url %> -
- <%= render "govuk_publishing_components/components/intervention", { - suggestion_text: "Help improve a new GOV.UK tool", - suggestion_link_text: "Sign up to take part in user research", - suggestion_link_url: page.recruitment_survey_url, - new_tab: true, - } %> -
-<% end %> - <% if page.slug == "benefits" %>
diff --git a/app/views/second_level_browse_page/show_curated.html.erb b/app/views/second_level_browse_page/show_curated.html.erb index e9a9e57db..db00ce1a4 100644 --- a/app/views/second_level_browse_page/show_curated.html.erb +++ b/app/views/second_level_browse_page/show_curated.html.erb @@ -17,8 +17,8 @@ <%= render "shared/browse_breadcrumbs" %> <% end %> -<% margin_bottom = page.recruitment_survey_url ? 7 : 8 %> -<%= render "shared/browse_header", { two_thirds: true, margin_bottom: margin_bottom } do %> +<%= render "shared/browse_header", { two_thirds: true, margin_bottom: 8 } do %> + <%= render "govuk_publishing_components/components/heading", { font_size: "xl", heading_level: 1, @@ -33,17 +33,6 @@ } %> <% end %> -<% if page.recruitment_survey_url %> -
- <%= render "govuk_publishing_components/components/intervention", { - suggestion_text: "Help improve a new GOV.UK tool", - suggestion_link_text: "Sign up to take part in user research", - suggestion_link_url: page.recruitment_survey_url, - new_tab: true, - } %> -
-<% end %> -
diff --git a/app/views/subtopics/show.html.erb b/app/views/subtopics/show.html.erb index 082b64f2e..3df659f3e 100644 --- a/app/views/subtopics/show.html.erb +++ b/app/views/subtopics/show.html.erb @@ -18,17 +18,6 @@ <%= render "govuk_publishing_components/components/title", title_params %> <% end %> -<% if subtopic.recruitment_survey_url %> -
- <%= render "govuk_publishing_components/components/intervention", { - suggestion_text: "Help improve a new GOV.UK tool", - suggestion_link_text: "Sign up to take part in user research", - suggestion_link_url: subtopic.recruitment_survey_url, - new_tab: true, - } %> -
-<% end %> - <%= render( layout: "subtopic", locals: { diff --git a/spec/features/research_panel_banner_spec.rb b/spec/features/research_panel_banner_spec.rb deleted file mode 100644 index 36b280d2a..000000000 --- a/spec/features/research_panel_banner_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require "integration_spec_helper" - -RSpec.feature "Research panel banner" do - include SearchApiHelpers - include RecruitmentBannerHelper - - scenario "browse pages where we want to display User Research banner" do - schema = GovukSchemas::Example.find("mainstream_browse_page", example_name: "level_2_page") - schema["base_path"] = "/browse/tax" - stub_content_store_has_item(schema["base_path"], schema) - search_api_has_documents_for_browse_page(schema["content_id"], [schema["base_path"]], page_size: SearchApiSearch::PAGE_SIZE_TO_GET_EVERYTHING) - - visit schema["base_path"] - - expect(page.status_code).to eq(200) - expect(page).to have_selector(".gem-c-intervention") - end - - scenario "pages where we don't want to display User Research banner" do - schema = GovukSchemas::Example.find("mainstream_browse_page", example_name: "level_2_page") - stub_content_store_has_item(schema["base_path"], schema) - search_api_has_documents_for_browse_page(schema["content_id"], [schema["base_path"]], page_size: SearchApiSearch::PAGE_SIZE_TO_GET_EVERYTHING) - - visit schema["base_path"] - - expect(page.status_code).to eq(200) - expect(page).to_not have_selector(".gem-c-intervention") - end -end