Merge pull request #3920 from alphagov/remove_hardcoded_banner

Remove hardcoded banner code
alphagov · Dec 20, 2024 · aa5012f · aa5012f
2 parents 0936c40 + 606affc
commit aa5012f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 88 deletions.
diff --git a/app/helpers/recruitment_banner_helper.rb b/app/helpers/recruitment_banner_helper.rb
diff --git a/app/views/browse/show.html.erb b/app/views/browse/show.html.erb
@@ -37,6 +37,7 @@
   } %>
 <% end %>
 
+<%= render "govuk_web_banners/recruitment_banner" %>
 <% if page.popular_list %>
   <div class="govuk-width-container">
     <div class="browse__action-links">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,6 +7,9 @@
     unless (!content_item_h["locale"])
       lang = content_item_h["locale"]
     end
+    unless content_item_h["base_path"].include? "/browse"
+      call_recruitment_banner_partial = true
+    end
   end
 %>
 
@@ -19,6 +22,9 @@
       <%= render 'breadcrumbs' %>
     <% end %>
   <% end %>
+  <% if call_recruitment_banner_partial %>
+    <%= render "govuk_web_banners/recruitment_banner" %>
+  <% end %>
   <%=
     content_tag(:main,
       id: "content",

diff --git a/app/views/shared/_intervention_banner.html.erb b/app/views/shared/_intervention_banner.html.erb
diff --git a/features/step_definitions/viewing_browse_steps.rb b/features/step_definitions/viewing_browse_steps.rb
@@ -112,6 +112,7 @@ def top_level_browse_pages
 
 def add_browse_pages
   stub_content_store_has_item "/browse",
+                              base_path: "/browse",
                               links: {
                                 top_level_browse_pages:,
                               }

diff --git a/spec/controllers/browse_controller_spec.rb b/spec/controllers/browse_controller_spec.rb
@@ -7,6 +7,7 @@
     before do
       stub_content_store_has_item(
         "/browse",
+        base_path: "/browse",
         links: {
           top_level_browse_pages:,
         },

diff --git a/spec/features/content_store_organisations_spec.rb b/spec/features/content_store_organisations_spec.rb
@@ -96,6 +96,7 @@
 
   def organisations_content_hash
     @content_hash = {
+      base_path: "/government/organisations",
       title: "Departments, agencies and public bodies",
       details: {
         ordered_ministerial_departments: [

diff --git a/spec/fixtures/graphql/world_index.json b/spec/fixtures/graphql/world_index.json
@@ -1,6 +1,7 @@
 {
   "data": {
     "edition": {
+      "base_path": "/world",
       "title": "Help and services around the world",
       "details": {
         "world_locations": [

diff --git a/spec/helpers/recruitment_banner_helper_test.rb b/spec/helpers/recruitment_banner_helper_test.rb