cater for CBP responses even when page[size] is not passed on the request

Author: fbvilela

lib/zendesk_api/collection.rb

@@ -391,8 +391,14 @@ def set_page_and_count(body)
       @next_page, @prev_page = page_links(body)
 
       if cbp_response?(body)
-        @options["page"]["after"] = body["meta"]["after_cursor"]
-        @options["page"]["before"] = body["meta"]["before_cursor"]
+        @options.page = {} unless cbp_request?
+        # the line above means an intentional CBP request where page[size] is passed on the query
+        # this is to cater for CBP responses where we don't specify page[size] but the endpoint
+        # responds CBP by default. i.e  `client.trigger_categories.fetch`
+        @options.page.merge!(
+          after: body["meta"]["after_cursor"],
+          before: body["meta"]["before_cursor"]
+                             )
       elsif @next_page =~ /page=(\d+)/
         @options["page"] = $1.to_i - 1
       elsif @prev_page =~ /page=(\d+)/

spec/core/collection_spec.rb

@@ -543,6 +543,34 @@ def to_proc
         expect(subject.fetch(true)).to be_empty
       end
     end
+
+    context "when the request returns a Cursor Based Pagination type of response" do
+      let(:cbp_response) do
+        {
+          "meta" => {
+            "has_more" => true,
+            "after_cursor" => 'after_cursor',
+            "before_cursor" => 'before_cursor'
+          },
+          "links" => {
+            "next" => "next_page",
+            "prev" => "previous_page"
+          },
+          "test_resources" => [{ "id" => 1 }]
+        }
+      end
+      before do
+        stub_json_request(:get, %r{test_resources}, json(cbp_response))
+      end
+
+      it "should set the next and previous pages and cursors" do
+        subject.fetch
+        expect(subject.instance_variable_get(:@next_page)).to eq("next_page")
+        expect(subject.instance_variable_get(:@prev_page)).to eq("previous_page")
+        expect(subject.options.page.after).to eq("after_cursor")
+        expect(subject.options.page.before).to eq("before_cursor")
+      end
+    end
   end
 
   context "save" do