darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 00:07:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct whitelist to non-government in test name

Browse Source 
See c31264d4c for why ‘whitelist’ should be avoided. The use of
whitelist here was not referring to the user-maintained list, but to
mean ‘not a government’ email address. This commit renames these tests
to make that difference clear.
This commit is contained in:
Chris Hill-Scott
2020-06-12 09:15:23 +01:00
parent 8bc5fa5bb0
commit 0f0b2dad3f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/main/views/test_add_service.py
View File

@@ -314,7 +314,7 @@ def test_should_return_form_errors_with_duplicate_service_name_regardless_of_cas
) )
def test_non_whitelist_user_cannot_access_create_service_page( def test_non_government_user_cannot_access_create_service_page(
client_request, client_request,
mock_get_non_govuser, mock_get_non_govuser,
api_nongov_user_active, api_nongov_user_active,
@@ -327,7 +327,7 @@ def test_non_whitelist_user_cannot_access_create_service_page(
) )
def test_non_whitelist_user_cannot_create_service( def test_non_government_user_cannot_create_service(
client_request, client_request,
mock_get_non_govuser, mock_get_non_govuser,
api_nongov_user_active, api_nongov_user_active,

2
tests/app/main/views/test_forgot_password.py
View File

@@ -15,7 +15,7 @@ def test_should_render_forgot_password(client):
@pytest.mark.parametrize('email_address', [ @pytest.mark.parametrize('email_address', [
'test@user.gov.uk', 'test@user.gov.uk',
'someuser@notonwhitelist.com' 'someuser@notgovernment.com'
]) ])
def test_should_redirect_to_password_reset_sent_for_valid_email( def test_should_redirect_to_password_reset_sent_for_valid_email(
client, client,

4
tests/app/main/views/test_manage_users.py
View File

@@ -684,7 +684,7 @@ def test_should_show_folder_permission_form_if_service_has_folder_permissions_en
@pytest.mark.parametrize('email_address, gov_user', [ @pytest.mark.parametrize('email_address, gov_user', [
('test@example.gov.uk', True), ('test@example.gov.uk', True),
('test@nonwhitelist.com', False) ('test@example.com', False)
]) ])
def test_invite_user( def test_invite_user(
client_request, client_request,
@@ -735,7 +735,7 @@ def test_invite_user(
]) ])
@pytest.mark.parametrize('email_address, gov_user', [ @pytest.mark.parametrize('email_address, gov_user', [
('test@example.gov.uk', True), ('test@example.gov.uk', True),
('test@nonwhitelist.com', False) ('test@example.com', False)
]) ])
def test_invite_user_with_email_auth_service( def test_invite_user_with_email_auth_service(
client_request, client_request,

4
tests/conftest.py
View File

@@ -1152,7 +1152,7 @@ def api_nongov_user_active(fake_uuid):
'id': fake_uuid, 'id': fake_uuid,
'name': 'Test User', 'name': 'Test User',
'password': 'somepassword', 'password': 'somepassword',
'email_address': 'someuser@notonwhitelist.com', 'email_address': 'someuser@example.com',
'mobile_number': '07700 900762', 'mobile_number': '07700 900762',
'state': 'active', 'state': 'active',
'failed_login_count': 0, 'failed_login_count': 0,
@@ -1414,7 +1414,7 @@ def mock_register_user(mocker, api_user_pending):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_get_non_govuser(mocker, api_user_active): def mock_get_non_govuser(mocker, api_user_active):
api_user_active['email_address'] = 'someuser@notonwhitelist.com' api_user_active['email_address'] = 'someuser@example.com'
def _get_user(id_): def _get_user(id_):
api_user_active['id'] = id_ api_user_active['id'] = id_