darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-04 22:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop calling mock_get_no_api_keys and api_keys_mock like functions

Browse Source
This commit is contained in:
Katie Smith
2020-01-06 14:42:52 +00:00
parent c270895c7f
commit a602ce5937
2 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
tests/app/main/views/test_activity.py
View File

@@ -14,8 +14,6 @@ from tests.conftest import (
create_active_caseworking_user, create_active_caseworking_user,
create_active_user_view_permissions, create_active_user_view_permissions,
create_active_user_with_permissions, create_active_user_with_permissions,
mock_get_api_keys,
mock_get_no_api_keys,
mock_get_notifications, mock_get_notifications,
normalize_spaces, normalize_spaces,
) )
@@ -420,43 +418,12 @@ def test_search_recipient_form(
assert field['value'] == expected_search_box_contents assert field['value'] == expected_search_box_contents
@pytest.mark.parametrize(( @pytest.mark.parametrize('message_type, expected_search_box_label', [
'message_type,' (None, 'Search by email address, phone number or reference'),
'api_keys_mock,' ('sms', 'Search by phone number or reference'),
'expected_search_box_label,' ('email', 'Search by email address or reference'),
), [
(
None,
mock_get_no_api_keys,
'Search by email address or phone number',
),
(
None,
mock_get_api_keys,
'Search by email address, phone number or reference',
),
(
'sms',
mock_get_no_api_keys,
'Search by phone number',
),
(
'sms',
mock_get_api_keys,
'Search by phone number or reference',
),
(
'email',
mock_get_no_api_keys,
'Search by email address',
),
(
'email',
mock_get_api_keys,
'Search by email address or reference',
),
]) ])
def test_api_users_are_told_they_can_search_by_reference( def test_api_users_are_told_they_can_search_by_reference_when_service_has_api_keys(
client_request, client_request,
mocker, mocker,
fake_uuid, fake_uuid,
@@ -465,9 +432,32 @@ def test_api_users_are_told_they_can_search_by_reference(
mock_get_service_data_retention, mock_get_service_data_retention,
message_type, message_type,
expected_search_box_label, expected_search_box_label,
api_keys_mock, mock_get_api_keys,
):
page = client_request.get(
'main.view_notifications',
service_id=SERVICE_ONE_ID,
message_type=message_type,
)
assert page.select_one('label[for=to]').text.strip() == expected_search_box_label
@pytest.mark.parametrize('message_type, expected_search_box_label', [
(None, 'Search by email address or phone number'),
('sms', 'Search by phone number'),
('email', 'Search by email address'),
])
def test_api_users_are_not_told_they_can_search_by_reference_when_service_has_no_api_keys(
client_request,
mocker,
fake_uuid,
mock_get_notifications,
mock_get_service_statistics,
mock_get_service_data_retention,
message_type,
expected_search_box_label,
mock_get_no_api_keys,
): ):
api_keys_mock(mocker, fake_uuid)
page = client_request.get( page = client_request.get(
'main.view_notifications', 'main.view_notifications',
service_id=SERVICE_ONE_ID, service_id=SERVICE_ONE_ID,

3
tests/conftest.py
View File

@@ -1687,8 +1687,7 @@ def mock_get_api_keys(mocker, fake_uuid):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
# Second argument added so can be used interchangeably with `mock_get_api_keys` def mock_get_no_api_keys(mocker):
def mock_get_no_api_keys(mocker, _=None):
def _get_keys(service_id): def _get_keys(service_id):
keys = {'apiKeys': []} keys = {'apiKeys': []}
return keys return keys