Fix pagination (#119)

Ensure page parameter is actually passed to query parameters

Author: yakky

changes/116.bugfix

@@ -0,0 +1 @@
+Fix pagination

taiga/models/base.py

@@ -65,6 +65,8 @@ def list(self, pagination=True, page_size=None, page=None, **queryparams):  # no
             except (ValueError, TypeError):
                 page_size = 100
             queryparams["page_size"] = page_size
+        if page and pagination:
+            queryparams["page"] = page
         result = self.requester.get(self.instance.endpoint, query=queryparams, paginate=pagination)
         objects = SearchableList()
         objects.extend(self.parse_list(result.json()))

tests/test_model_base.py

@@ -245,13 +245,13 @@ def test_call_model_base_list_elements_single_page(self, mock_requestmaker_get):
         mock_requestmaker_get.return_value = MockResponse(200, data)
         f_list = fakes.list(page_size=5, page=1)
         self.assertEqual(len(f_list), 5)
-        mock_requestmaker_get.assert_called_with("fakes", query={"page_size": 5}, paginate=True)
+        mock_requestmaker_get.assert_called_with("fakes", query={"page_size": 5, "page": 1}, paginate=True)
 
         data = json.dumps(js_list[5:])
         mock_requestmaker_get.return_value = MockResponse(200, data)
         f_list = fakes.list(page_size=5, page=2)
         self.assertEqual(len(f_list), 4)
-        mock_requestmaker_get.assert_called_with("fakes", query={"page_size": 5}, paginate=True)
+        mock_requestmaker_get.assert_called_with("fakes", query={"page_size": 5, "page": 2}, paginate=True)
 
     def test_to_dict_method(self):
         rm = RequestMaker("/api/v1", "fakehost", "faketoken")

tests/test_user_stories.py

@@ -21,6 +21,33 @@ def test_list_attachments(self, mock_requestmaker_get):
         UserStory(rm, id=1).list_attachments()
         mock_requestmaker_get.assert_called_with("userstories/attachments", query={"object_id": 1}, paginate=True)
 
+    @patch("taiga.requestmaker.RequestMaker.get")
+    def test_list_userstories_page_2(self, mock_requestmaker_get):
+        mock_requestmaker_get.return_value = MockResponse(
+            200, create_mock_json("tests/resources/userstories_list_success.json")
+        )
+        api = TaigaAPI(token="f4k3")
+        api.user_stories.list(page=1, page_size=2)
+        mock_requestmaker_get.assert_called_with("userstories", query={"page_size": 2, "page": 1}, paginate=True)
+
+    @patch("taiga.requestmaker.RequestMaker.get")
+    def test_list_userstories_page_1(self, mock_requestmaker_get):
+        mock_requestmaker_get.return_value = MockResponse(
+            200, create_mock_json("tests/resources/userstories_list_success.json")
+        )
+        api = TaigaAPI(token="f4k3")
+        api.user_stories.list(page_size=2)
+        mock_requestmaker_get.assert_called_with("userstories", query={"page_size": 2}, paginate=True)
+
+    @patch("taiga.requestmaker.RequestMaker.get")
+    def test_list_userstories_no_pagination(self, mock_requestmaker_get):
+        mock_requestmaker_get.return_value = MockResponse(
+            200, create_mock_json("tests/resources/userstories_list_success.json")
+        )
+        api = TaigaAPI(token="f4k3")
+        api.user_stories.list(pagination=False, page=2, page_size=3)
+        mock_requestmaker_get.assert_called_with("userstories", query={}, paginate=False)
+
     @patch("taiga.requestmaker.RequestMaker.get")
     def test_single_userstory_parsing(self, mock_requestmaker_get):
         mock_requestmaker_get.return_value = MockResponse(