Fix minor bugs in PR after review.

Author: josemacassan

tests/integration/conftest.py

@@ -150,9 +150,9 @@ def account_user(account,account_user_params) -> AccountUser:
     cleanup(user)
 
 @pytest.fixture(scope='module')
-def service_plan_params(service) -> dict:
+def service_plan_params() -> dict:
     suffix = get_suffix()
-    return dict(name=f"test-{suffix}")
+    return {"name":f'test-{suffix}'}
 
 @pytest.fixture(scope='module')
 def service_plan(service, service_plan_params) -> ServicePlan:
@@ -162,8 +162,7 @@ def service_plan(service, service_plan_params) -> ServicePlan:
 
 @pytest.fixture(scope='module')
 def service_subscription_params(service_plan) -> dict:
-    suffix = get_suffix()
-    return dict(plan_id=service_plan['id'])
+    return {"plan_id":service_plan['id']}
 
 @pytest.fixture(scope='module')
 def service_subscription(account, service_subscription_params) -> ServiceSubscription:

threescale_api/resources.py

@@ -277,8 +277,7 @@ def pending(self, entity_id, **kwargs) -> 'Account':
 class ServiceSubscriptions(DefaultClient):
 
     def __init__(self, *args, entity_name='service_subscription',
-                 entity_collection='service_subscriptions',
-                 per_page=None, **kwargs):
+                 entity_collection='service_subscriptions', **kwargs):
         super().__init__(*args, entity_name=entity_name,
                          entity_collection=entity_collection, **kwargs)
 
@@ -293,7 +292,7 @@ def approve(self, entity_id: int, **kwargs):
         return instance
 
     def change_plan(self, entity_id: int, plan_id: int, **kwargs):
-        params = dict(plan_id=plan_id)
+        params = {"plan_id":plan_id}
         url = self.url + f"/{entity_id}/change_plan.json"
         response = self.rest.put(url=url, json=params, **kwargs)
         instance = utils.extract_response(response=response)
@@ -303,7 +302,7 @@ def change_plan(self, entity_id: int, plan_id: int, **kwargs):
 class ServicePlans(DefaultClient):
 
     def __init__(self, *args, entity_name='service_plan',
-                 entity_collection='service_plans', per_page=None, **kwargs):
+                 entity_collection='service_plans', **kwargs):
         super().__init__(*args, entity_name=entity_name,
                          entity_collection=entity_collection, **kwargs)
 
@@ -1188,10 +1187,10 @@ class ServiceSubscription(DefaultResource):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    def approve(self, entity_id: int, **kwargs):
+    def approve(self, **kwargs):
         return self.client.approve(entity_id=self.entity_id, **kwargs)
 
-    def change_plan(self, entity_id: int, **kwargs):
+    def change_plan(self, **kwargs):
         return self.client.change_plan(entity_id=self.entity_id, **kwargs)