wip

Author: GDSNewt

app/models/document_collection_non_whitehall_link/govuk_url.rb

@@ -32,11 +32,7 @@ def parsed_url
 
   def content_item
     content_id
-    @content_item ||= begin
-      Services.publishing_api.get_content(@content_id).to_h
-    rescue GdsApi::HTTPNotFound
-      content_item_from_content_store
-    end
+    @content_item ||= content_item_from_content_store
   end
 
   def content_id

features/step_definitions/document_collection_steps.rb

@@ -157,7 +157,8 @@
   content_id = SecureRandom.uuid
 
   stub_publishing_api_has_lookups(base_path => content_id)
-  stub_publishing_api_has_item(
+  stub_content_store_has_item(
+    base_path,
     content_id:,
     base_path:,
     publishing_app: "content-publisher",

test/unit/app/models/document_collection_non_whitehall_link/govuk_url_test.rb

@@ -10,6 +10,12 @@ class DocumentCollectionNonWhitehallLink::GovukUrlTest < ActiveSupport::TestCase
       base_path: "/test",
       publishing_app: "content-publisher",
     )
+    Services.content_store.stubs(:content_item).with("/test").returns(
+      "content_id" => @content_id,
+      "title" => "Test",
+      "base_path" => "/test",
+      "publishing_app" => "content-publisher",
+    )
   end
 
   test "should be valid without a GOV.UK url that Publishing API knows" do
@@ -33,11 +39,13 @@ class DocumentCollectionNonWhitehallLink::GovukUrlTest < ActiveSupport::TestCase
   test "should be valid when a mainstream guide sub-page url is used" do
     content_id = SecureRandom.uuid
     stub_publishing_api_has_lookups("/foo" => content_id)
-    stub_publishing_api_has_item(content_id:,
-                                 title: "Foo Bar",
-                                 base_path: "/foo",
-                                 document_type: "guide",
-                                 publishing_app: "content-publisher")
+    Services.content_store.stubs(:content_item).with("/foo/subpage").returns(
+      "content_id" => content_id,
+      "title" => "Foo Bar",
+      "base_path" => "/foo",
+      "publishing_app" => "content-publisher",
+      "document_type" => "guide",
+    )
 
     url = DocumentCollectionNonWhitehallLink::GovukUrl.new(
       url: "https://www.gov.uk/foo/subpage",
@@ -99,12 +107,6 @@ class DocumentCollectionNonWhitehallLink::GovukUrlTest < ActiveSupport::TestCase
 
   test "should be valid when a Welsh-language GOV.UK URL is used that is not in the Publishing API path reservations" do
     welsh_content_id = SecureRandom.uuid
-    stub_publishing_api_has_item(
-      content_id: welsh_content_id,
-      title: "Talu cosb hunanasesiad",
-      base_path: "/talu-cosb-hunanasesiad",
-      publishing_app: "publisher",
-    )
     content_store_response = { "content_id" => welsh_content_id, "title" => "Talu cosb hunanasesiad", "base_path" => "/talu-cosb-hunanasesiad", "publishing_app" => "publisher" }
     Services.content_store.stubs(:content_item).with("/talu-cosb-hunanasesiad").returns(content_store_response)
 
@@ -116,6 +118,20 @@ class DocumentCollectionNonWhitehallLink::GovukUrlTest < ActiveSupport::TestCase
     assert url.valid?
   end
 
+  test "should be valid when a Welsh-language GOV.UK URL is in the Publishing API but only has a Welsh locale" do
+    welsh_content_id = SecureRandom.uuid
+    stub_publishing_api_has_lookups("/talu-treth-twe" => welsh_content_id)
+    content_store_response = { "content_id" => welsh_content_id, "title" => "Talu TWE y cyflogwr", "base_path" => "/talu-treth-twe", "publishing_app" => "publisher", "locale" => "cy" }
+    Services.content_store.stubs(:content_item).with("/talu-treth-twe").returns(content_store_response)
+
+    url = DocumentCollectionNonWhitehallLink::GovukUrl.new(
+      url: "https://www.gov.uk/talu-treth-twe",
+      document_collection_group: build(:document_collection_group),
+    )
+
+    assert url.valid?
+  end
+
   test "should be invalid when Publishing API returns a 404" do
     stub_any_publishing_api_call_to_return_not_found
 
@@ -131,11 +147,13 @@ class DocumentCollectionNonWhitehallLink::GovukUrlTest < ActiveSupport::TestCase
   test "should be invalid when a non-mainstream guide sub-page url is used" do
     content_id = SecureRandom.uuid
     stub_publishing_api_has_lookups("/foo" => content_id)
-    stub_publishing_api_has_item(content_id:,
-                                 title: "Foo Bar",
-                                 base_path: "/foo",
-                                 document_type: "other",
-                                 publishing_app: "content-publisher")
+    Services.content_store.stubs(:content_item).with("/foo/subpage").returns(
+      "content_id" => content_id,
+      "title" => "Foo Bar",
+      "base_path" => "/foo",
+      "publishing_app" => "content-publisher",
+      "document_type" => "other",
+    )
 
     url = DocumentCollectionNonWhitehallLink::GovukUrl.new(
       url: "https://www.gov.uk/foo/subpage",