Implement suggested changes from PR review.

Author: josemacassan

tests/integration/conftest.py

@@ -156,9 +156,9 @@ def service_plan_params(service) -> dict:
 
 @pytest.fixture(scope='module')
 def service_plan(service, service_plan_params) -> ServicePlan:
-
     resource = service.service_plans.create(params=service_plan_params)
     yield resource
+    cleanup(resource)
 
 @pytest.fixture(scope='module')
 def service_subscription_params(service_plan) -> dict:
@@ -169,6 +169,7 @@ def service_subscription_params(service_plan) -> dict:
 def service_subscription(account, service_subscription_params) -> ServiceSubscription:
     resource = account.service_subscriptions.create(params=service_subscription_params)
     yield resource
+    cleanup(resource)
 
 @pytest.fixture(scope='module')
 def application_plan_params() -> dict:

tests/integration/test_integration_service_plans.py

@@ -1,16 +1,12 @@
-import pytest
 
 
-from tests.integration.conftest import service
-from threescale_api.errors import ApiClientError
-
 from tests.integration import asserts
 
-def test_list_service_plans(service, service_plan):
+def test_list_service_plans(service):
     resource = service.service_plans.list()
     assert len(resource) >= 1
 
-def test_check_service_plan_creation(service, service_plan, service_plan_params):
+def test_check_service_plan_creation(service_plan, service_plan_params):
     asserts.assert_resource(service_plan)
     asserts.assert_resource_params(service_plan, service_plan_params)
     assert service_plan.exists()
@@ -29,7 +25,7 @@ def test_update_service_plans(service, service_plan, service_plan_params):
     asserts.assert_resource(resource)
     asserts.assert_resource_params(service_plan, service_plan_params)
 
-def test_set_default_service_plan(service, service_plan, service_plan_params):
+def test_set_default_service_plan(service_plan, service_plan_params):
     asserts.assert_resource(service_plan)
     resource = service_plan.set_default()
     asserts.assert_resource(resource)

tests/integration/test_integration_service_subscriptions.py

@@ -1,23 +1,16 @@
-import pytest
-import backoff
 
-from tests.integration.conftest import account
-from threescale_api.errors import ApiClientError
 
 from tests.integration import asserts
 
-def test_list_service_subscriptions(account, service_subscription):
+def test_list_service_subscriptions(account):
     resource = account.service_subscriptions.list()
     assert len(resource) >= 1
 
-def test_should_create_service_subscription(account, service_subscription, service_subscription_params):
+def test_create_service_subscription(service_subscription, service_subscription_params):
     asserts.assert_resource(service_subscription)
     asserts.assert_resource_params(service_subscription, service_subscription_params)
 
-def test_should_read_service_subscription(account, service_subscription, service_subscription_params):
+def test_read_service_subscription(account, service_subscription, service_subscription_params):
     resource = account.service_subscriptions.read(service_subscription.entity_id)
     asserts.assert_resource(resource)
     asserts.assert_resource_params(service_subscription,service_subscription_params)
-
-
-

threescale_api/resources.py

@@ -286,13 +286,13 @@ def __init__(self, *args, entity_name='service_subscription',
     def url(self) -> str:
         return self.parent.url + '/service_subscriptions'
 
-    def approve_service_subscription(self, entity_id: int, **kwargs):
+    def approve(self, entity_id: int, **kwargs):
         url = self.url + f"/{entity_id}/approve.json"
         response = self.rest.put(url=url, **kwargs)
         instance = utils.extract_response(response=response)
         return instance
 
-    def change_plan_service_subscription(self, entity_id: int, plan_id: int, **kwargs):
+    def change_plan(self, entity_id: int, plan_id: int, **kwargs):
         params = dict(plan_id=plan_id)
         url = self.url + f"/{entity_id}/change_plan.json"
         response = self.rest.put(url=url, json=params, **kwargs)
@@ -1188,10 +1188,10 @@ class ServiceSubscription(DefaultResource):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    def approve_service_subscription(self, entity_id: int, **kwargs):
+    def approve(self, entity_id: int, **kwargs):
         return self.client.approve_service_subscription(entity_id=self.entity_id, **kwargs)
 
-    def change_plan_service_subscription(self, entity_id: int, **kwargs):
+    def change_plan(self, entity_id: int, **kwargs):
         return self.client.change_plan_service_subscription(entity_id=self.entity_id, **kwargs)