Fix conflicts, synchronize tests

Author: samuelpx

tests/resources/test_folders.py

@@ -76,7 +76,6 @@ def test_list_folders_with_single_level_param(self, http_client_list_response):
             "GET",
             "/v3/grants/abc-123/folders",
             None,
-            {"include_hidden_folders": True},
             {"single_level": True},
             None,
             overrides=None,
@@ -90,6 +89,15 @@ def test_list_folders_with_include_hidden_folders_false(
         folders.list(
             identifier="abc-123", query_params={"include_hidden_folders": False}
         )
+        
+        http_client_list_response._execute.assert_called_once_with(
+            "GET",
+            "/v3/grants/abc-123/folders",
+            None,
+            {"include_hidden_folders": False},
+            None,
+            overrides=None,
+        )
 
     def test_list_folders_with_single_level_false(self, http_client_list_response):
         folders = Folders(http_client_list_response)
@@ -100,7 +108,6 @@ def test_list_folders_with_single_level_false(self, http_client_list_response):
             "GET",
             "/v3/grants/abc-123/folders",
             None,
-            {"include_hidden_folders": False},
             {"single_level": False},
             None,
             overrides=None,
@@ -109,8 +116,6 @@ def test_list_folders_with_single_level_false(self, http_client_list_response):
     def test_list_folders_with_multiple_params_including_hidden_folders(
         self, http_client_list_response
     ):
-      
-    def test_list_folders_with_combined_params(self, http_client_list_response):
         folders = Folders(http_client_list_response)
 
         folders.list(
@@ -119,16 +124,15 @@ def test_list_folders_with_combined_params(self, http_client_list_response):
                 "limit": 20,
                 "parent_id": "parent-123",
                 "include_hidden_folders": True,
+                "single_level": True,
             },
-            query_params={"single_level": True, "parent_id": "parent-123", "limit": 10},
         )
 
         http_client_list_response._execute.assert_called_once_with(
             "GET",
             "/v3/grants/abc-123/folders",
             None,
-            {"limit": 20, "parent_id": "parent-123", "include_hidden_folders": True},
-            {"single_level": True, "parent_id": "parent-123", "limit": 10},
+            {"limit": 20, "parent_id": "parent-123", "include_hidden_folders": True, "single_level": True},
             None,
             overrides=None,
         )