Inherit don’t duplicate API client constructor

This removes some code which is duplicative and obscure (ie it’s not
very clear why we do `"a" * 73` even though there is a Very Good Reason
for doing so).
This commit is contained in:
Chris Hill-Scott
2019-01-29 11:12:33 +00:00
parent eae0a5a632
commit 1d3a4e5043
22 changed files with 8 additions and 63 deletions

View File

@@ -9,8 +9,6 @@ from app.notify_client import NotifyAdminAPIClient
from tests import service_json
from tests.conftest import api_user_active, platform_admin_user, set_config
SAMPLE_API_KEY = '{}-{}'.format('a' * 36, 's' * 36)
@pytest.mark.parametrize('method', [
'put',
@@ -26,7 +24,7 @@ SAMPLE_API_KEY = '{}-{}'.format('a' * 36, 's' * 36)
None
], ids=['active_service', 'no_service'])
def test_active_service_can_be_modified(app_, method, user, service):
api_client = NotifyAdminAPIClient(SAMPLE_API_KEY, 'base_url')
api_client = NotifyAdminAPIClient()
with app_.test_request_context() as request_context, app_.test_client() as client:
client.login(user)
@@ -45,7 +43,7 @@ def test_active_service_can_be_modified(app_, method, user, service):
'delete'
])
def test_inactive_service_cannot_be_modified_by_normal_user(app_, api_user_active, method):
api_client = NotifyAdminAPIClient(SAMPLE_API_KEY, 'base_url')
api_client = NotifyAdminAPIClient()
with app_.test_request_context() as request_context, app_.test_client() as client:
client.login(api_user_active)
@@ -64,7 +62,7 @@ def test_inactive_service_cannot_be_modified_by_normal_user(app_, api_user_activ
'delete'
])
def test_inactive_service_can_be_modified_by_platform_admin(app_, platform_admin_user, method):
api_client = NotifyAdminAPIClient(SAMPLE_API_KEY, 'base_url')
api_client = NotifyAdminAPIClient()
with app_.test_request_context() as request_context, app_.test_client() as client:
client.login(platform_admin_user)
@@ -78,7 +76,7 @@ def test_inactive_service_can_be_modified_by_platform_admin(app_, platform_admin
def test_generate_headers_sets_standard_headers(app_):
api_client = NotifyAdminAPIClient(SAMPLE_API_KEY, 'base_url')
api_client = NotifyAdminAPIClient()
with set_config(app_, 'ROUTE_SECRET_KEY_1', 'proxy-secret'):
api_client.init_app(app_)
@@ -93,7 +91,7 @@ def test_generate_headers_sets_standard_headers(app_):
def test_generate_headers_sets_request_id_if_in_request_context(app_):
api_client = NotifyAdminAPIClient(SAMPLE_API_KEY, 'base_url')
api_client = NotifyAdminAPIClient()
api_client.init_app(app_)
with app_.test_request_context() as request_context: