gds-api-adapters 36.4.1 → 37.0.0

data/test/licence_application_api_test.rb

@@ -72,10 +72,12 @@ EOS
     assert_nil api.details_for_licence(nil)
   end
 
-  def test_should_return_nil_if_licence_is_unrecognised
+  def test_should_raise_if_licence_is_unrecognised
     licence_does_not_exist('bloop')
 
-    assert_nil api.details_for_licence("bloop")
+    assert_raises(GdsApi::HTTPNotFound) do
+      api.details_for_licence("bloop")
+    end
   end
 
   def test_should_provide_full_licence_details_for_canonical_id
@@ -90,16 +92,20 @@ EOS
     assert_equal expected, api.details_for_licence("590001").to_hash
   end
 
-  def test_should_return_nil_for_bad_snac_code_entry
+  def test_should_raise_for_bad_snac_code_entry
     licence_does_not_exist('590001/bleep')
 
-    assert_nil api.details_for_licence("590001", "bleep")
+    assert_raises(GdsApi::HTTPNotFound) do
+      api.details_for_licence("590001", "bleep")
+    end
   end
 
-  def test_should_return_nil_for_bad_licence_id_and_snac_code
+  def test_should_raise_for_bad_licence_id_and_snac_code
     licence_does_not_exist('bloop/bleep')
 
-    assert_nil api.details_for_licence("bloop", "bleep")
+    assert_raises(GdsApi::HTTPNotFound) do
+      api.details_for_licence("bloop", "bleep")
+    end
   end
 
   def test_should_return_error_message_to_pick_a_relevant_snac_code_for_the_provided_licence_id
@@ -108,7 +114,9 @@ EOS
       to_return(status: 404,
                 body: "{\"error\": \"No authorities found for the licence 590001 and for the snacCode sw10\"}")
 
-    assert_nil api.details_for_licence("590001", "sw10")
+    assert_raises(GdsApi::HTTPNotFound) do
+      api.details_for_licence("590001", "sw10")
+    end
   end
 
   def test_should_return_full_licence_details_with_location_specific_information

data/test/list_response_test.rb

@@ -80,12 +80,27 @@ describe GdsApi::ListResponse do
           ]
         }
       }
-      @p1_response = stub(:body => page_1.to_json, :status => 200, 
-         :headers => {:link => '<http://www.example.com/1>; rel="self", <http://www.example.com/2>; rel="next"'})
-      @p2_response = stub(:body => page_2.to_json, :status => 200, 
-         :headers => {:link => '<http://www.example.com/2>; rel="self", <http://www.example.com/3>; rel="next", <http://www.example.com/1>; rel="previous"'})
-      @p3_response = stub(:body => page_3.to_json, :status => 200, 
-         :headers => {:link => '<http://www.example.com/3>; rel="self", <http://www.example.com/1>; rel="previous"'})
+      @p1_response = stub(
+        body: page_1.to_json,
+        status: 200,
+        headers: {
+          link: '<http://www.example.com/1>; rel="self", <http://www.example.com/2>; rel="next"'
+        }
+      )
+      @p2_response = stub(
+        body: page_2.to_json,
+        status: 200,
+        headers: {
+          link: '<http://www.example.com/2>; rel="self", <http://www.example.com/3>; rel="next", <http://www.example.com/1>; rel="previous"'
+        }
+      )
+      @p3_response = stub(
+        body: page_3.to_json,
+        status: 200,
+        headers: {
+          link: '<http://www.example.com/3>; rel="self", <http://www.example.com/1>; rel="previous"'
+        }
+      )
 
       @client = stub()
       @client.stubs(:get_list!).with("http://www.example.com/1").returns(GdsApi::ListResponse.new(@p1_response, @client))
@@ -97,7 +112,7 @@ describe GdsApi::ListResponse do
       it "should allow accessing the next page" do
         resp = GdsApi::ListResponse.new(@p1_response, @client)
         assert resp.has_next_page?
-        assert_equal %w(foo2 bar2), resp.next_page.results
+        assert_equal %w(foo2 bar2), resp.next_page['results']
       end
 
       it "should return nil with no next page" do
@@ -121,7 +136,7 @@ describe GdsApi::ListResponse do
       it "should allow accessing the previous page" do
         resp = GdsApi::ListResponse.new(@p2_response, @client)
         assert resp.has_previous_page?
-        assert_equal %w(foo1 bar1), resp.previous_page.results
+        assert_equal %w(foo1 bar1), resp.previous_page['results']
       end
 
       it "should return nil with no previous page" do

data/test/local_links_manager_api_test.rb

@@ -145,25 +145,28 @@ describe GdsApi::LocalLinksManager do
     end
 
     describe "when making request with invalid required parameters" do
-      it "returns nil when authority_slug is invalid" do
+      it "raises when authority_slug is invalid" do
         local_links_manager_does_not_have_required_objects("hogwarts", 2)
 
-        response = @api.local_link("hogwarts", 2)
-        assert_equal nil, response
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api.local_link("hogwarts", 2)
+        end
       end
 
-      it "returns nil when LGSL is invalid" do
+      it "raises when LGSL is invalid" do
         local_links_manager_does_not_have_required_objects("blackburn", 999)
 
-        response = @api.local_link("blackburn", 999)
-        assert_equal nil, response
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api.local_link("blackburn", 999)
+        end
       end
 
-      it "returns nil when the LGSL and LGIL combination is invalid" do
+      it "raises when the LGSL and LGIL combination is invalid" do
         local_links_manager_does_not_have_required_objects("blackburn", 2, 9)
 
-        response = @api.local_link("blackburn", 2, 9)
-        assert_equal nil, response
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api.local_link("blackburn", 2, 9)
+        end
       end
     end
   end
@@ -223,11 +226,10 @@ describe GdsApi::LocalLinksManager do
     end
 
     describe 'when making a request with invalid required parameters' do
-      it "returns nil when authority_slug is invalid" do
+      it "raises when authority_slug is invalid" do
         local_links_manager_does_not_have_an_authority("hogwarts")
 
-        response = @api.local_authority("hogwarts")
-        assert_equal nil, response
+        assert_raises(GdsApi::HTTPNotFound) { @api.local_authority("hogwarts") }
       end
     end
   end

data/test/mapit_test.rb

@@ -45,10 +45,12 @@ describe GdsApi::Mapit do
       assert_equal "30UN", response.areas.last.codes['ons']
     end
 
-    it "should return nil if a postcode doesn't exist" do
+    it "should raise if a postcode doesn't exist" do
       mapit_does_not_have_a_postcode("SW1A 1AA")
 
-      assert_nil @api.location_for_postcode("SW1A 1AA")
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api.location_for_postcode("SW1A 1AA")
+      end
     end
 
     it "should return 400 for an invalid postcode" do
@@ -83,7 +85,7 @@ describe GdsApi::Mapit do
     it "should return and empty result for an unknown area type" do
       response = @api.areas_for_type('FOO')
 
-      assert_empty response
+      assert_empty response.parsed_content
     end
   end
 
@@ -109,7 +111,9 @@ describe GdsApi::Mapit do
     end
 
     it "should return 404 for a missing area of a certain code type" do
-      assert_nil @api.area_for_code('govuk_slug', 'neverland')
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api.area_for_code('govuk_slug', 'neverland')
+      end
     end
   end
 end

data/test/need_api_test.rb

@@ -38,24 +38,24 @@ describe GdsApi::NeedApi do
       needs = @api.needs_by_id(1,2,3)
 
       assert_equal 3, needs.count
-      assert_equal %w(1 2 3), needs.map(&:id)
-      assert_equal "apply for a primary school place", needs.results[0].goal
-      assert_equal "find out about becoming a British citizen", needs.results[1].goal
-      assert_equal "find out about unemployment benefits", needs.results[2].goal
+      assert_equal %w(1 2 3), needs.map { |need| need['id'] }
+      assert_equal "apply for a primary school place", needs['results'][0]['goal']
+      assert_equal "find out about becoming a British citizen", needs['results'][1]['goal']
+      assert_equal "find out about unemployment benefits", needs['results'][2]['goal']
     end
 
     it "makes the same request regardless of the order of the IDs" do
       needs = @api.needs_by_id(2,1,3)
 
       assert_equal 3, needs.count
-      assert_equal %w(1 2 3), needs.map(&:id)
+      assert_equal %w(1 2 3), needs.map { |need| need['id'] }
     end
 
     it "correctly sorts IDs requested as strings" do
       needs = @api.needs_by_id(%w(02 3 1))
 
       assert_equal 3, needs.count
-      assert_equal %w(1 2 3), needs.map(&:id)
+      assert_equal %w(1 2 3), needs.map { |need| need['id'] }
     end
   end
 
@@ -109,12 +109,30 @@ describe GdsApi::NeedApi do
       assert_requested(req)
       assert_equal 2, needs.count
 
-      assert_equal ["parent", "user"], needs.map(&:role)
-      assert_equal ["apply for a primary school place", "find out about becoming a British citizen"], needs.map(&:goal)
-      assert_equal ["my child can start school", "i can take the correct steps to apply for citizenship"], needs.map(&:benefit)
+      assert_equal %w(parent user), needs.map { |need| need['role'] }
+      assert_equal(
+        [
+          "apply for a primary school place",
+          "find out about becoming a British citizen"
+        ],
+        needs.map { |need| need['goal'] }
+      )
+      assert_equal(
+        [
+          "my child can start school",
+          "i can take the correct steps to apply for citizenship"
+        ],
+        needs.map { |need| need['benefit'] }
+      )
 
-      assert_equal "department-for-education", needs.first.organisations.first.id
-      assert_equal "Department for Education", needs.first.organisations.first.name
+      assert_equal(
+        "department-for-education",
+        needs.first['organisations'].first['id']
+      )
+      assert_equal(
+        "Department for Education",
+        needs.first['organisations'].first['name']
+      )
     end
   end
 
@@ -189,12 +207,15 @@ describe GdsApi::NeedApi do
       need_api_has_need(need)
 
       need_response = @api.need(100500)
-      assert_equal "good things", need_response.benefit
+      assert_equal "good things", need_response['benefit']
     end
 
-    it "should return nil for a missing need" do
+    it "should raise for a missing need" do
       need_api_has_no_need(100600)
-      assert_nil @api.need(100600)
+
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api.need(100600)
+      end
     end
   end
 

data/test/organisations_api_test.rb

@@ -16,8 +16,8 @@ describe GdsApi::Organisations do
       organisations_api_has_organisations(organisation_slugs)
 
       response = @api.organisations
-      assert_equal organisation_slugs, response.map {|r| r.details.slug }
-      assert_equal "Tea Agency", response.results[1].title
+      assert_equal organisation_slugs, response.map { |r| r['details']['slug'] }
+      assert_equal "Tea Agency", response['results'][1]['title']
     end
 
     it "should handle the pagination" do
@@ -25,7 +25,10 @@ describe GdsApi::Organisations do
       organisations_api_has_organisations(organisation_slugs)
 
       response = @api.organisations
-      assert_equal organisation_slugs, response.with_subsequent_pages.map {|r| r.details.slug }
+      assert_equal(
+        organisation_slugs,
+        response.with_subsequent_pages.map { |r| r['details']['slug'] }
+      )
     end
 
     it "should raise error if endpoint 404s" do
@@ -41,13 +44,15 @@ describe GdsApi::Organisations do
       organisations_api_has_organisation('ministry-of-fun')
 
       response = @api.organisation('ministry-of-fun')
-      assert_equal 'Ministry Of Fun', response.title
+      assert_equal 'Ministry Of Fun', response['title']
     end
 
-    it "should return nil for a non-existent organisation" do
+    it "should raise for a non-existent organisation" do
       organisations_api_does_not_have_organisation('non-existent')
 
-      assert_nil @api.organisation('non-existent')
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api.organisation('non-existent')
+      end
     end
   end
 end

data/test/panopticon_test.rb

@@ -39,7 +39,7 @@ describe GdsApi::Panopticon do
     panopticon_has_metadata(basic_artefact)
 
     artefact = api.artefact_for_slug(basic_artefact[:slug])
-    assert_equal 'An artefact', artefact.name
+    assert_equal 'An artefact', artefact['name']
   end
 
   it 'fetches an artefact as a hash given a slug' do
@@ -55,11 +55,13 @@ describe GdsApi::Panopticon do
     assert_equal 1, api.get_json(url)['a']
   end
 
-  it 'returns nil if the endpoint returns 404' do
+  it 'raises if the endpoint returns 404' do
     url = "#{base_api_endpoint}/some.json"
     stub_request(:get, url).to_return(status: Rack::Utils.status_code(:not_found))
 
-    assert_nil api.get_json(url)
+    assert_raises(GdsApi::HTTPNotFound) do
+      api.get_json(url)
+    end
   end
 
   it 'constructs the correct URL for a slug' do
@@ -70,8 +72,14 @@ describe GdsApi::Panopticon do
     panopticon_has_metadata(artefact_with_contact)
 
     artefact = api.artefact_for_slug(artefact_with_contact[:slug])
-    assert_equal 'Department for Environment, Food and Rural Affairs (Defra)', artefact.contact.name
-    assert_equal 'helpline@defra.gsi.gov.uk', artefact.contact.email_address
+    assert_equal(
+      'Department for Environment, Food and Rural Affairs (Defra)',
+      artefact['contact']['name']
+    )
+    assert_equal(
+      'helpline@defra.gsi.gov.uk',
+      artefact['contact']['email_address']
+    )
   end
 
   it 'creates a new artefact' do

data/test/publisher_api_test.rb

@@ -59,7 +59,7 @@ describe GdsApi::Publisher do
     publication_exists(basic_answer)
     pub = api.publication_for_slug(basic_answer['slug'])
 
-    assert_equal "Something", pub.body
+    assert_equal "Something", pub['body']
   end
 
   it "should optionally accept an edition id" do
@@ -84,8 +84,8 @@ describe GdsApi::Publisher do
   it "should deserialise parts into whole objects" do
     publication_exists(publication_with_parts)
     pub = api.publication_for_slug(publication_with_parts['slug'])
-    assert_equal 3, pub.parts.size
-    assert_equal "introduction", pub.parts.first.slug
+    assert_equal 3, pub['parts'].size
+    assert_equal "introduction", pub['parts'].first['slug']
   end
 
   it "should have part specific methods for a publication with parts" do
@@ -97,7 +97,7 @@ describe GdsApi::Publisher do
   it "should deserialise updated at as a time" do
     publication_exists(publication_with_parts)
     pub = api.publication_for_slug(publication_with_parts['slug'])
-    assert_equal Time, pub.updated_at.class
+    assert_equal Time, pub['updated_at'].class
   end
 
   it "should be able to retrieve local transaction details" do

data/test/publishing_api_v2/get_expanded_links_test.rb

@@ -77,9 +77,9 @@ describe GdsApi::PublishingApiV2 do
           status: 404
         )
 
-      response = @api_client.get_expanded_links(@content_id)
-
-      assert_nil response
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api_client.get_expanded_links(@content_id)
+      end
     end
   end
 end

data/test/publishing_api_v2/get_links_test.rb

@@ -33,7 +33,10 @@ describe GdsApi::PublishingApiV2 do
       it "responds with the links" do
         response = @api_client.get_links(@content_id)
         assert_equal 200, response.code
-        assert_equal ["20583132-1619-4c68-af24-77583172c070"], response.links.organisations
+        assert_equal(
+          ["20583132-1619-4c68-af24-77583172c070"],
+          response['links']['organisations']
+        )
       end
     end
 
@@ -58,7 +61,7 @@ describe GdsApi::PublishingApiV2 do
       it "responds with the empty link set" do
         response = @api_client.get_links(@content_id)
         assert_equal 200, response.code
-        assert_equal OpenStruct.new({}), response.links
+        assert_equal({}, response['links'])
       end
     end
 
@@ -77,8 +80,9 @@ describe GdsApi::PublishingApiV2 do
       end
 
       it "responds with 404" do
-        response = @api_client.get_links(@content_id)
-        assert_nil response
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api_client.get_links(@content_id)
+        end
       end
     end
   end

data/test/publishing_api_v2_test.rb

@@ -493,7 +493,9 @@ describe GdsApi::PublishingApiV2 do
       end
 
       it "responds with 404" do
-        assert_nil @api_client.get_content(@content_id)
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api_client.get_content(@content_id)
+        end
       end
     end
   end
@@ -951,7 +953,10 @@ describe GdsApi::PublishingApiV2 do
           organisations: ["591436ab-c2ae-416f-a3c5-1901d633fbfb"],
         })
         assert_equal 200, response.code
-        assert_equal ["591436ab-c2ae-416f-a3c5-1901d633fbfb"], response.links.organisations
+        assert_equal(
+          ["591436ab-c2ae-416f-a3c5-1901d633fbfb"],
+          response['links']['organisations']
+        )
       end
     end
 
@@ -989,10 +994,13 @@ describe GdsApi::PublishingApiV2 do
         })
 
         assert_equal 200, response.code
-        assert_equal(OpenStruct.new(
-          topics: ["225df4a8-2945-4e9b-8799-df7424a90b69"],
-          organisations: ["20583132-1619-4c68-af24-77583172c070"],
-        ), response.links)
+        assert_equal(
+          {
+            'topics' => ["225df4a8-2945-4e9b-8799-df7424a90b69"],
+            'organisations' => ["20583132-1619-4c68-af24-77583172c070"],
+          },
+          response['links']
+        )
       end
     end
 
@@ -1027,7 +1035,7 @@ describe GdsApi::PublishingApiV2 do
         })
 
         assert_equal 200, response.code
-        assert_equal OpenStruct.new({}), response.links
+        assert_equal({}, response['links'])
       end
     end
 
@@ -1064,9 +1072,12 @@ describe GdsApi::PublishingApiV2 do
         })
 
         assert_equal 200, response.code
-        assert_equal(OpenStruct.new(
-          organisations: ["591436ab-c2ae-416f-a3c5-1901d633fbfb"],
-        ), response.links)
+        assert_equal(
+          {
+            'organisations' => ["591436ab-c2ae-416f-a3c5-1901d633fbfb"],
+          },
+          response['links']
+        )
       end
     end
 
@@ -1214,7 +1225,7 @@ describe GdsApi::PublishingApiV2 do
         .with(
           method: :get,
           path: "/v2/content",
-          query: "content_format=topic&fields%5B%5D=title&fields%5B%5D=base_path",
+          query: "document_type=topic&fields%5B%5D=title&fields%5B%5D=base_path",
           headers: GdsApi::JsonClient.default_request_headers.merge(
             "Authorization" => "Bearer #{@bearer_token}"
           ),
@@ -1226,7 +1237,7 @@ describe GdsApi::PublishingApiV2 do
             pages: 1,
             current_page: 1,
             links: [{
-              href: "http://example.org/v2/content?content_format=topic&fields[]=title&fields[]=base_path&page=1",
+              href: "http://example.org/v2/content?document_type=topic&fields[]=title&fields[]=base_path&page=1",
               rel: "self"
             }],
             results: [
@@ -1237,7 +1248,7 @@ describe GdsApi::PublishingApiV2 do
         )
 
       response = @api_client.get_content_items(
-        content_format: 'topic',
+        document_type: 'topic',
         fields: [:title, :base_path],
       )
 
@@ -1247,7 +1258,7 @@ describe GdsApi::PublishingApiV2 do
         ["total", 2],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=title&fields[]=base_path&page=1", "rel"=>"self"}]],
+        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=title&fields[]=base_path&page=1", "rel"=>"self"}]],
         ["results", [{"title"=>"Content Item A", "base_path"=>"/a-base-path"}, {"title"=>"Content Item B", "base_path"=>"/another-base-path"}]]
       ], response.to_a
 
@@ -1260,7 +1271,7 @@ describe GdsApi::PublishingApiV2 do
         .with(
           method: :get,
           path: "/v2/content",
-          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale",
+          query: "document_type=topic&fields%5B%5D=content_id&fields%5B%5D=locale",
           headers: GdsApi::JsonClient.default_request_headers.merge(
             "Authorization" => "Bearer #{@bearer_token}"
           ),
@@ -1272,7 +1283,7 @@ describe GdsApi::PublishingApiV2 do
             pages: 1,
             current_page: 1,
             links: [{
-              href: "http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&page=1",
+              href: "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&page=1",
               rel: "self"
             }],
             results: [
@@ -1282,7 +1293,7 @@ describe GdsApi::PublishingApiV2 do
         )
 
       response = @api_client.get_content_items(
-        content_format: 'topic',
+        document_type: 'topic',
         fields: [:content_id, :locale],
       )
 
@@ -1292,7 +1303,7 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&page=1", "rel"=>"self"}]],
+        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&page=1", "rel"=>"self"}]],
         ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"}]]
       ], response.to_a
     end
@@ -1304,7 +1315,7 @@ describe GdsApi::PublishingApiV2 do
         .with(
           method: :get,
           path: "/v2/content",
-          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=fr",
+          query: "document_type=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=fr",
           headers: GdsApi::JsonClient.default_request_headers.merge(
             "Authorization" => "Bearer #{@bearer_token}"
           ),
@@ -1316,7 +1327,7 @@ describe GdsApi::PublishingApiV2 do
             pages: 1,
             current_page: 1,
             links: [{
-              href: "http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1",
+              href: "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1",
               rel: "self"
             }],
             results: [
@@ -1326,7 +1337,7 @@ describe GdsApi::PublishingApiV2 do
         )
 
       response = @api_client.get_content_items(
-        content_format: 'topic',
+        document_type: 'topic',
         fields: [:content_id, :locale],
         locale: 'fr',
       )
@@ -1336,7 +1347,7 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1", "rel"=>"self"}]],
+        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1", "rel"=>"self"}]],
         ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"}]]
       ], response.to_a
     end
@@ -1348,7 +1359,7 @@ describe GdsApi::PublishingApiV2 do
         .with(
           method: :get,
           path: "/v2/content",
-          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=all",
+          query: "document_type=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=all",
           headers: GdsApi::JsonClient.default_request_headers.merge(
             "Authorization" => "Bearer #{@bearer_token}"
           ),
@@ -1360,7 +1371,7 @@ describe GdsApi::PublishingApiV2 do
             pages: 1,
             current_page: 1,
             links: [{
-              href: "http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=all&page=1",
+              href: "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=all&page=1",
               rel: "self"
             }],
             results: [
@@ -1372,7 +1383,7 @@ describe GdsApi::PublishingApiV2 do
         )
 
       response = @api_client.get_content_items(
-        content_format: 'topic',
+        document_type: 'topic',
         fields: [:content_id, :locale],
         locale: 'all',
       )
@@ -1382,7 +1393,7 @@ describe GdsApi::PublishingApiV2 do
         ["total", 3],
         ["pages", 1], ["current_page", 1],
         ["links",
-         [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=all&page=1", "rel"=>"self"}]],
+         [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=all&page=1", "rel"=>"self"}]],
         ["results",
          [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"},
           {"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"},
@@ -1397,7 +1408,7 @@ describe GdsApi::PublishingApiV2 do
         .with(
           method: :get,
           path: "/v2/content",
-          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=details",
+          query: "document_type=topic&fields%5B%5D=content_id&fields%5B%5D=details",
           headers: GdsApi::JsonClient.default_request_headers.merge(
             "Authorization" => "Bearer #{@bearer_token}"
           ),
@@ -1409,7 +1420,7 @@ describe GdsApi::PublishingApiV2 do
             pages: 1,
             current_page: 1,
             links: [{
-              href: "http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=details&page=1",
+              href: "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=details&page=1",
               rel: "self"
             }],
             results: [
@@ -1419,7 +1430,7 @@ describe GdsApi::PublishingApiV2 do
         )
 
       response = @api_client.get_content_items(
-        content_format: 'topic',
+        document_type: 'topic',
         fields: [:content_id, :details],
       )
 
@@ -1429,7 +1440,7 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=details&page=1", "rel"=>"self"}]],
+        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=details&page=1", "rel"=>"self"}]],
         ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "details"=>{"foo"=>"bar"}}]]
       ], response.to_a
     end
@@ -1542,14 +1553,13 @@ describe GdsApi::PublishingApiV2 do
       end
 
       it "404s" do
-        response = @api_client.get_linked_items(
-          @content_id,
-          {
+        assert_raises(GdsApi::HTTPNotFound) do
+          @api_client.get_linked_items(
+            @content_id,
             link_type: "topic",
-            fields: ["content_id", "base_path"],
-          }
-        )
-        assert_nil response
+            fields: %w(content_id base_path),
+          )
+        end
       end
     end