Merge pull request #9766 from alphagov/make-jobs-section-optional

Remove default value for jobs url
alphagov · Jan 2, 2025 · 664e8f9 · 664e8f9
2 parents 6c8a325 + f26774b
commit 664e8f9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 22 deletions.
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
@@ -9,7 +9,6 @@ class Organisation < ApplicationRecord
 
   date_attributes(:closed_at)
 
-  DEFAULT_JOBS_URL = "https://www.civilservicejobs.service.gov.uk/csr".freeze
   FEATURED_DOCUMENTS_DISPLAY_LIMIT = 6
 
   has_one :default_news_image, class_name: "FeaturedImageData", as: :featured_imageable, inverse_of: :featured_imageable
@@ -416,7 +415,7 @@ def select_name
   end
 
   def jobs_url
-    custom_jobs_url.presence || DEFAULT_JOBS_URL
+    custom_jobs_url.presence
   end
 
   def indexable_content

diff --git a/app/presenters/publishing_api/corporate_information_page_presenter.rb b/app/presenters/publishing_api/corporate_information_page_presenter.rb
@@ -153,6 +153,8 @@ def page_content_ids_by_menu_heading(menu_heading)
       end
 
       def payload_for_jobs
+        return if organisation.jobs_url.blank?
+
         {
           title: "Jobs",
           url: organisation.jobs_url,

diff --git a/app/presenters/publishing_api/organisation_presenter.rb b/app/presenters/publishing_api/organisation_presenter.rb
@@ -201,10 +201,12 @@ def corporate_information_pages
         }
       end
 
-      cips << {
-        title: I18n.t("organisation.corporate_information.jobs"),
-        href: item.jobs_url,
-      }
+      if item.jobs_url.present?
+        cips << {
+          title: I18n.t("organisation.corporate_information.jobs"),
+          href: item.jobs_url,
+        }
+      end
 
       cips
     end

diff --git a/test/unit/app/models/organisation_test.rb b/test/unit/app/models/organisation_test.rb
@@ -929,12 +929,7 @@ class OrganisationTest < ActiveSupport::TestCase
     assert_equal [org_with_announcement], Organisation.with_statistics_announcements
   end
 
-  test "#jobs_url defaults to the default jobs url" do
-    organisation = build(:organisation)
-    assert_equal Organisation::DEFAULT_JOBS_URL, organisation.jobs_url
-  end
-
-  test "#jobs_url can be overridden" do
+  test "#jobs_url can be set" do
     organisation = build(:organisation, custom_jobs_url: "http://jobs.com/")
 
     assert organisation.valid?

diff --git a/test/unit/app/presenters/publishing_api/corporate_information_page_presenter_test.rb b/test/unit/app/presenters/publishing_api/corporate_information_page_presenter_test.rb
@@ -275,10 +275,6 @@ class AboutCorporateInformationPage < TestCase
       jobs = [
         @procurement_corporate_information_page.content_id,
         @recruitment_corporate_information_page.content_id,
-        {
-          title: "Jobs",
-          url: corporate_information_page.organisation.jobs_url,
-        },
       ]
 
       our_information = [

diff --git a/test/unit/app/presenters/publishing_api/organisation_presenter_test.rb b/test/unit/app/presenters/publishing_api/organisation_presenter_test.rb
@@ -64,12 +64,7 @@ def govspeak_to_html(govspeak)
           crest: "single-identity",
         },
         foi_exempt: false,
-        ordered_corporate_information_pages: [
-          {
-            title: "Jobs",
-            href: "https://www.civilservicejobs.service.gov.uk/csr",
-          },
-        ],
+        ordered_corporate_information_pages: [],
         secondary_corporate_information_pages: "",
         ordered_featured_links: [],
         ordered_featured_documents: [],