gds-api-adapters 35.0.0 → 35.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de808a31aebeb02fcb1731a56452fac86864c84
-  data.tar.gz: 89d5c19db3a0a4c9558a2817bc01b77315fcf58f
+  metadata.gz: e333779f06ac4e6cd7cdc357ecd49415ff7504ff
+  data.tar.gz: 6f5769410683e7342de9505201bf22a1c02732bf
 SHA512:
-  metadata.gz: 0aa623216d9876b2c935af07011504a32169b1199eb071bfd68090f43de2aaa1cbde4feeaf3288bae53e9e30485076ecf7b952ae5c73d882cef6be3f589ab546
-  data.tar.gz: 0048a9e7a5cd71b3d832c3d1cdae804b59557b06e835ae1efe4b12133a2e503d2975fc4fd5cebf28ef1124cd827e1f81f3e7380ea6758047d8a85ca3b6d5bf21
+  metadata.gz: 4e75bf5a23893d51a70361a55f1d2b805658678b569f5e4d2f8bd2cdef3b339f5142d3962ee612dac18841cf592685b5969ed7ad2c27b0dade2800fe1fd9c2df
+  data.tar.gz: db78f0b50042f099c4fc43a2cd71c0286b69bccea372e7add1727cb55da56aa29a59183e9401c8496d6ba4990f51a46eb315891bb63459dada26260969a20f6f

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -169,7 +169,20 @@ module GdsApi
       #)
       def publishing_api_has_content(items, params = {})
         url = PUBLISHING_API_V2_ENDPOINT + "/content"
-        stub_request(:get, url).with(:query => params).to_return(status: 200, body: { results: items }.to_json, headers: {})
+        per_page = params.fetch(:per_page, 50)
+        page = params.fetch(:page, 1)
+        number_of_pages = items.count < per_page ? 1 : items.count / per_page
+
+        body = {
+          results: items,
+          total: items.count,
+          pages: number_of_pages,
+          current_page: page
+        }
+
+        stub_request(:get, url)
+          .with(query: params)
+          .to_return(status: 200, body: body.to_json, headers: {})
       end
 
       # This method has been refactored into publishing_api_has_content (above)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '35.0.0'
+  VERSION = '35.0.1'
 end

data/test/publishing_api_test.rb

@@ -8,7 +8,7 @@ describe GdsApi::PublishingApi do
 
   before do
     @base_api_url = Plek.current.find("publishing-api")
-    @api_client = GdsApi::PublishingApi.new('http://localhost:3093')
+    @api_client = GdsApi::PublishingApi.new(publishing_api_host)
   end
 
   describe "#put_content_item" do

data/test/publishing_api_v2/get_expanded_links_test.rb

@@ -6,7 +6,7 @@ describe GdsApi::PublishingApiV2 do
   include PactTest
 
   before do
-    @api_client = GdsApi::PublishingApiV2.new('http://localhost:3093')
+    @api_client = GdsApi::PublishingApiV2.new(publishing_api_host)
     @content_id = "bed722e6-db68-43e5-9079-063f623335a7"
   end
 

data/test/publishing_api_v2/get_links_test.rb

@@ -6,7 +6,7 @@ describe GdsApi::PublishingApiV2 do
   include PactTest
 
   before do
-    @api_client = GdsApi::PublishingApiV2.new('http://localhost:3093')
+    @api_client = GdsApi::PublishingApiV2.new(publishing_api_host)
     @content_id = "bed722e6-db68-43e5-9079-063f623335a7"
   end
 

data/test/publishing_api_v2/lookup_test.rb

@@ -6,7 +6,7 @@ describe GdsApi::PublishingApiV2 do
   include PactTest
 
   before do
-    @api_client = GdsApi::PublishingApiV2.new('http://localhost:3093')
+    @api_client = GdsApi::PublishingApiV2.new(publishing_api_host)
   end
 
   describe "#lookup_content_id" do

data/test/publishing_api_v2_test.rb

@@ -29,7 +29,7 @@ describe GdsApi::PublishingApiV2 do
     @bearer_token = "example-bearer-token"
     @base_api_url = Plek.current.find("publishing-api")
     @api_client = GdsApi::PublishingApiV2.new(
-      "http://localhost:3093",
+      publishing_api_host,
       bearer_token: @bearer_token,
     )
 

data/test/test_helpers/pact_helper.rb

@@ -1,7 +1,13 @@
+PUBLISHING_API_PORT=3001
+
+def publishing_api_host
+  "http://localhost:#{PUBLISHING_API_PORT}"
+end
+
 Pact.service_consumer "GDS API Adapters" do
   has_pact_with "Publishing API" do
     mock_service :publishing_api do
-      port 3093
+      port PUBLISHING_API_PORT
     end
   end
 end

data/test/test_helpers/publishing_api_v2_test.rb

@@ -25,6 +25,47 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
 
       assert_equal([{ "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504" }], response)
     end
+
+    it 'allows params' do
+      publishing_api_has_content(
+        [{
+          "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504"
+        }],
+        document_type: 'document_collection',
+        query: 'query',
+      )
+
+      response = publishing_api.get_content_items(
+        document_type: 'document_collection',
+        query: 'query'
+      )['results']
+
+      assert_equal(
+        [{ "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504" }],
+        response
+      )
+    end
+
+    it 'returns pagination results' do
+      publishing_api_has_content(
+        [
+          { "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504" },
+          { "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd505" },
+          { "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd506" },
+          { "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd507" },
+        ],
+        {
+          page: 1,
+          per_page: 2
+        }
+      )
+
+      response = publishing_api.get_content_items({ page: 1, per_page: 2 })
+
+      assert_equal(response['total'], 4)
+      assert_equal(response['pages'], 2)
+      assert_equal(response['current_page'], 1)
+    end
   end
 
   describe "#publishing_api_has_expanded_links" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 35.0.0
+  version: 35.0.1
 platform: ruby
 authors:
 - James Stewart