gds-api-adapters 36.4.0 → 36.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adaaae453e95827a4b45119e1fa4af4e677c30f
-  data.tar.gz: 8398a28ba9d312dee84402c0f4b5c25f0629aba6
+  metadata.gz: 06df600e92d5e29ebcc9d2d1011169f25ed806d3
+  data.tar.gz: 61a8846b1ce2833f1c72124435c154f5246439e5
 SHA512:
-  metadata.gz: 2391b55015a41eb094d96409442fa7d1203737e250f5eda7cb040d8fc7692dbfe199afed1e4c4ca280452f3cc9ecd0efa99bbaa0eef8373c40d1be7ef8bb663c
-  data.tar.gz: abefc29609acf31b9d565d6526a0eba7e9a9264d38e2be28900509ba36194bda0e126fb5397e8968569465355930e200871658d679c19625dc763207a1bfe490
+  metadata.gz: 66e7c5af97fc0c0f6766be3b134757b96b3e448b231f4898d284d7b53b49bed2521903c7a9621e27bfde9c657bee2febc3b3ab38ad469901cde1f469d5fee6b9
+  data.tar.gz: 972920cf66478a2134769bcb57958dd70ea58278162d40671940c0c0604552cddc620b33f7293ed295a51cd11fae9896c4a1bb7cb15ff52bca945dac51a0f9fe

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -169,6 +169,7 @@ module GdsApi
       #)
       def publishing_api_has_content(items, params = {})
         url = PUBLISHING_API_V2_ENDPOINT + "/content"
+
         if params.respond_to? :fetch
           per_page = params.fetch(:per_page, 50)
           page = params.fetch(:page, 1)
@@ -176,10 +177,19 @@ module GdsApi
           per_page = 50
           page = 1
         end
-        number_of_pages = items.count < per_page ? 1 : items.count / per_page
+
+        start_position = (page-1) * per_page
+        page_items = items.slice(start_position, per_page) || []
+
+        number_of_pages =
+          if items.count < per_page
+            1
+          else
+            (items.count / per_page.to_f).ceil
+          end
 
         body = {
-          results: items,
+          results: page_items,
           total: items.count,
           pages: number_of_pages,
           current_page: page

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '36.4.0'
+  VERSION = '36.4.1'
 end

data/test/publishing_api_v2_test.rb

@@ -339,6 +339,49 @@ describe GdsApi::PublishingApiV2 do
         end
       end
 
+      describe "when a content item cannot be published because of a path conflict" do
+        before do
+          @content_item = content_item_for_content_id(@content_id)
+
+          publishing_api
+            .given("a draft content item exists with content_id #{@content_id} with a blocking live item at the same path")
+            .upon_receiving("a request to return the draft content item")
+            .with(
+              method: :get,
+              path: "/v2/content/#{@content_id}",
+              headers: GdsApi::JsonClient.default_request_headers.merge(
+                "Authorization" => "Bearer #{@bearer_token}"
+              ),
+            )
+            .will_respond_with(
+              status: 200,
+              body: {
+                "warnings" => Pact.like({"content_item_blocking_publish" => "message"}),
+                "content_id" => @content_id,
+                "document_type" => Pact.like("special_route"),
+                "schema_name" => Pact.like("special_route"),
+                "publishing_app" => Pact.like("publisher"),
+                "rendering_app" => Pact.like("frontend"),
+                "locale" => Pact.like("en"),
+                "routes" => Pact.like([{}]),
+                "public_updated_at" => Pact.like("2015-07-30T13:58:11.000Z"),
+                "details" => Pact.like({}),
+                "publication_state" => "draft"
+              },
+              headers: {
+                "Content-Type" => "application/json; charset=utf-8",
+              },
+            )
+        end
+
+        it "responds with 200 and the draft content item containing a warning" do
+          response = @api_client.get_content(@content_id, version: 2)
+          assert_equal 200, response.code
+          assert_equal hash_including("content_item_blocking_publish"), response["warnings"]
+        end
+
+      end
+
       describe "when requesting the published version" do
         before do
           @content_item = content_item_for_content_id(@content_id)

data/test/test_helpers/publishing_api_v2_test.rb

@@ -46,13 +46,16 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
       )
     end
 
-    it 'returns pagination results' do
+    it 'returns paginated results' do
+      content_id_1 = "2878337b-bed9-4e7f-85b6-10ed2cbcd504"
+      content_id_2 = "2878337b-bed9-4e7f-85b6-10ed2cbcd505"
+      content_id_3 = "2878337b-bed9-4e7f-85b6-10ed2cbcd506"
+
       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" },
+          { "content_id" => content_id_1 },
+          { "content_id" => content_id_2 },
+          { "content_id" => content_id_3 },
         ],
         {
           page: 1,
@@ -61,10 +64,36 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
       )
 
       response = publishing_api.get_content_items({ page: 1, per_page: 2 })
+      records = response['results']
 
-      assert_equal(response['total'], 4)
+      assert_equal(response['total'], 3)
       assert_equal(response['pages'], 2)
       assert_equal(response['current_page'], 1)
+
+      assert_equal(records.length, 2)
+      assert_equal(records.first['content_id'], content_id_1)
+      assert_equal(records.last['content_id'], content_id_2)
+    end
+
+    it 'returns an empty list of results for out-of-bound queries' do
+      content_id_1 = "2878337b-bed9-4e7f-85b6-10ed2cbcd504"
+      content_id_2 = "2878337b-bed9-4e7f-85b6-10ed2cbcd505"
+
+      publishing_api_has_content(
+        [
+          { "content_id" => content_id_1 },
+          { "content_id" => content_id_2 },
+        ],
+        {
+          page: 10,
+          per_page: 2
+        }
+      )
+
+      response = publishing_api.get_content_items({ page: 10, per_page: 2 })
+      records = response['results']
+
+      assert_equal(records, [])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 36.4.0
+  version: 36.4.1
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek