Skip to content

Add tests into ServiceSubscriptions resource. #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkudlej merged 6 commits into from
Mar 6, 2025
Merged

Add tests into ServiceSubscriptions resource. #167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9913377
Add tests into ServiceSubscriptions resource
josemacassan Feb 17, 2025
d22f056
Modify test for Service Subscriptions
josemacassan Feb 25, 2025
caacdac
Update tests for Service Subscriptions, approve and change plan.
josemacassan Mar 5, 2025
9027664
Fix bugs after PR review.
josemacassan Mar 6, 2025
5e31794
Simplify test for approve service subscription after PR review.
josemacassan Mar 6, 2025
4a9f2b5
Change test setup for set 'approval_required' parameter to bool for S…
josemacassan Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/integration/test_integration_service_subscriptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,22 @@ def test_read_service_subscription(account, service_subscription, service_subscr
resource = account.service_subscriptions.read(service_subscription.entity_id)
asserts.assert_resource(resource)
asserts.assert_resource_params(service_subscription,service_subscription_params)


def test_change_plan_service_subscription(account, account_plan, service_subscription):
asserts.assert_resource(account)
asserts.assert_resource(account_plan)
resource = account.service_subscriptions.change_plan(service_subscription.entity_id,
account_plan.entity_id)
asserts.assert_resource(resource)


# TODO: https://issues.redhat.com/browse/THREESCALE-11693
def test_approve_service_subscription(account, service_subscription,service_subscription_params):
asserts.assert_resource(service_subscription)
service_subscription['state'] = 'pending'
account.service_subscriptions.update(service_subscription.entity_id,
service_subscription_params)
resource = account.service_subscriptions.approve(service_subscription.entity_id)
Copy link
Copy Markdown

@mkudlej mkudlej Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to simplified this line.

asserts.assert_resource(resource)
asserts.assert_resource_params(service_subscription, service_subscription_params)
6 changes: 3 additions & 3 deletions threescale_api/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@ def url(self) -> str:
return self.parent.url + '/service_subscriptions'

def approve(self, entity_id: int, **kwargs):
url = self.url + f"/{entity_id}/approve.json"
url = self.url + f"/{entity_id}/approve"
response = self.rest.put(url=url, **kwargs)
instance = utils.extract_response(response=response)
return instance

def change_plan(self, entity_id: int, plan_id: int, **kwargs):
params = {"plan_id": plan_id}
url = self.url + f"/{entity_id}/change_plan.json"
response = self.rest.put(url=url, json=params, **kwargs)
url = self.url + f"/{entity_id}/change_plan"
response = self.rest.put(url=url, params=params)
instance = utils.extract_response(response=response)
return instance

Expand Down