Skip to content

Commit 20a44df

Browse files
committed
add get all applications plans test
GET /admin/api/application_plans
1 parent d2ff206 commit 20a44df

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

tests/integration/conftest.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Proxy, Backend, Metric, MappingRule,
1414
BackendMappingRule, BackendUsage,
1515
ActiveDoc, Webhooks, InvoiceState,
16-
ApplicationKey)
16+
ApplicationKey, ApplicationPlans)
1717

1818
load_dotenv()
1919

@@ -127,6 +127,11 @@ def application_plan(api, service, application_plan_params) -> ApplicationPlan:
127127
resource = service.app_plans.create(params=application_plan_params)
128128
yield resource
129129

130+
@pytest.fixture(scope='module')
131+
def application_plans(api) -> ApplicationPlans:
132+
application_plans = api.application_plans
133+
yield application_plans
134+
130135

131136
@pytest.fixture(scope='module')
132137
def application_params(application_plan):

tests/integration/test_integration_application_plan.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,8 @@ def test_application_plan_update(application_plan, update_params):
2424
updated_app_plan = application_plan.update(params=update_params)
2525
asserts.assert_resource(updated_app_plan)
2626
asserts.assert_resource_params(updated_app_plan, update_params)
27+
28+
29+
def test_application_plans_list_all(application_plans):
30+
app_plans = application_plans.list()
31+
assert len(app_plans) >= 1

threescale_api/client.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ def __init__(self, url: str, token: str,
3737
self._access_tokens = \
3838
resources.AccessTokens(self, instance_klass=resources.AccessToken)
3939
self._active_docs = resources.ActiveDocs(self, instance_klass=resources.ActiveDoc)
40+
self._application_plans = \
41+
resources.ApplicationPlans(self, instance_klass=resources.ApplicationPlan)
4042
self._account_plans = resources.AccountPlans(self, instance_klass=resources.AccountPlan)
4143
self._settings = resources.SettingsClient(self)
4244
self._admin_portal_auth_providers = resources.AdminPortalAuthProviders(
@@ -142,6 +144,13 @@ def master_api_url(self) -> str:
142144
"""
143145
return self.url + "/master/api"
144146

147+
@property
148+
def application_plans(self) -> resources.ApplicationPlans:
149+
"""Get applications_plan client
150+
Returns(resources.ApplicationPlans): ApplicationPlans client
151+
"""
152+
return self._application_plans
153+
145154
@property
146155
def services(self) -> resources.Services:
147156
"""Gets services client

threescale_api/resources.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ def __init__(self, *args, entity_name='application_plan', entity_collection='pla
128128

129129
@property
130130
def url(self) -> str:
131-
return self.parent.url + '/application_plans'
131+
if type(self.parent) is Service:
132+
return self.parent.url + '/application_plans'
133+
return self.threescale_client.admin_api_url + '/application_plans'
132134

133135
@property
134136
def plans_url(self) -> str:

0 commit comments

Comments
 (0)