From 22f301189a84fcf0c2038636516de9308745a228 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 16 Aug 2023 07:19:18 -0700 Subject: [PATCH] code review feedback remove british fake email addresses --- tests/app/celery/test_tasks.py | 4 ++-- tests/app/conftest.py | 8 +++---- tests/app/dao/test_services_dao.py | 16 ++++++------- tests/app/dao/test_users_dao.py | 4 ++-- tests/app/db.py | 4 ++-- tests/app/organization/test_rest.py | 4 ++-- .../test_send_notification.py | 4 ++-- tests/app/service/test_rest.py | 22 ++++++++--------- tests/app/test_model.py | 4 ++-- tests/app/user/test_rest.py | 24 +++++++++---------- 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index ff5a48e52..fc2824e2c 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -449,7 +449,7 @@ def test_should_save_sms_if_restricted_service_and_valid_number(notify_db_sessio def test_save_email_should_save_default_email_reply_to_text_on_notification(notify_db_session, mocker): service = create_service() - create_reply_to_email(service=service, email_address='reply_to@digital.gov.uk', is_default=True) + create_reply_to_email(service=service, email_address='reply_to@digital.fake.gov', is_default=True) template = create_template(service=service, template_type='email', subject='Hello') notification = _notification_json(template, to="test@example.com") @@ -463,7 +463,7 @@ def test_save_email_should_save_default_email_reply_to_text_on_notification(noti ) persisted_notification = Notification.query.one() - assert persisted_notification.reply_to_text == 'reply_to@digital.gov.uk' + assert persisted_notification.reply_to_text == 'reply_to@digital.fake.gov' def test_save_sms_should_save_default_sms_sender_notification_reply_to_text_on(notify_db_session, mocker): diff --git a/tests/app/conftest.py b/tests/app/conftest.py index 38b500455..45e68a389 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -176,14 +176,14 @@ def service_factory(sample_user): @pytest.fixture(scope='function') def sample_user(notify_db_session): return create_user( - email='notify@digital.cabinet-office.gov.uk' + email='notify@digital.fake.gov' ) @pytest.fixture(scope='function') def notify_user(notify_db_session): return create_user( - email="notify-service-user@digital.cabinet-office.gov.uk", + email="notify-service-user@digital.fake.gov", id_=current_app.config['NOTIFY_USER_ID'] ) @@ -517,7 +517,7 @@ def sample_notification_history(notify_db_session, sample_template): @pytest.fixture(scope='function') def sample_invited_user(notify_db_session): service = create_service(check_if_service_exists=True) - to_email_address = 'invited_user@digital.gov.uk' + to_email_address = 'invited_user@digital.fake.gov' from_user = service.users[0] @@ -796,7 +796,7 @@ def notify_service(notify_db_session, sample_user): @pytest.fixture(scope='function') def sample_service_guest_list(notify_db_session): service = create_service(check_if_service_exists=True) - guest_list_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'guest_list_user@digital.gov.uk') + guest_list_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'guest_list_user@digital.fake.gov') notify_db_session.add(guest_list_user) notify_db_session.commit() diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index f083b338d..8b9926c96 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -230,7 +230,7 @@ def test_should_add_user_to_service(notify_db_session): assert user in Service.query.first().users new_user = User( name='Test User', - email_address='new_user@digital.cabinet-office.gov.uk', + email_address='new_user@digital.fake.gov', password='password', mobile_number='+12028675309' ) @@ -299,7 +299,7 @@ def test_should_remove_user_from_service(notify_db_session): dao_create_service(service, user) new_user = User( name='Test User', - email_address='new_user@digital.cabinet-office.gov.uk', + email_address='new_user@digital.fake.gov', password='password', mobile_number='+12028675309' ) @@ -320,14 +320,14 @@ def test_should_remove_user_from_service_exception(notify_db_session): dao_create_service(service, user) new_user = User( name='Test User', - email_address='new_user@digital.cabinet-office.gov.uk', + email_address='new_user@digital.fake.gov', password='password', mobile_number='+12028675309' ) save_model_user(new_user, validated_email_access=True) wrong_user = User( name='Wrong User', - email_address='wrong_user@digital.cabinet-office.gov.uk', + email_address='wrong_user@digital.fake.gov', password='password', mobile_number='+12028675309' ) @@ -425,7 +425,7 @@ def test_get_all_user_services_only_returns_services_user_has_access_to(notify_d service_3 = create_service(service_name='service 3', user=user, email_from='service.3') new_user = User( name='Test User', - email_address='new_user@digital.cabinet-office.gov.uk', + email_address='new_user@digital.fake.gov', password='password', mobile_number='+12028675309' ) @@ -479,7 +479,7 @@ def test_dao_fetch_live_services_data(sample_user): assert results == [ {'service_id': mock.ANY, 'service_name': 'Sample service', 'organization_name': 'test_org_1', 'organization_type': 'federal', 'consent_to_research': None, 'contact_name': 'Test User', - 'contact_email': 'notify@digital.cabinet-office.gov.uk', 'contact_mobile': '+12028675309', + 'contact_email': 'notify@digital.fake.gov', 'contact_mobile': '+12028675309', 'live_date': datetime(2014, 4, 20, 10, 0), 'sms_volume_intent': None, 'email_volume_intent': None, 'sms_totals': 2, 'email_totals': 1, 'free_sms_fragment_limit': 100}, {'service_id': mock.ANY, 'service_name': 'third', 'organization_name': None, 'consent_to_research': None, @@ -487,7 +487,7 @@ def test_dao_fetch_live_services_data(sample_user): 'contact_mobile': None, 'live_date': datetime(2016, 4, 20, 10, 0), 'sms_volume_intent': None, 'email_volume_intent': None, 'sms_totals': 0, 'email_totals': 0, 'free_sms_fragment_limit': 200}, {'service_id': mock.ANY, 'service_name': 'second', 'organization_name': None, 'consent_to_research': None, - 'contact_name': 'Test User', 'contact_email': 'notify@digital.cabinet-office.gov.uk', + 'contact_name': 'Test User', 'contact_email': 'notify@digital.fake.gov', 'contact_mobile': '+12028675309', 'live_date': datetime(2017, 4, 20, 10, 0), 'sms_volume_intent': None, 'organization_type': None, 'email_volume_intent': None, 'sms_totals': 0, 'email_totals': 0, 'free_sms_fragment_limit': 300} @@ -714,7 +714,7 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(not other_user = User( name='Other Test User', - email_address='other_user@digital.cabinet-office.gov.uk', + email_address='other_user@digital.fake.gov', password='password', mobile_number='+12028672000' ) diff --git a/tests/app/dao/test_users_dao.py b/tests/app/dao/test_users_dao.py index a6c85124a..a94087739 100644 --- a/tests/app/dao/test_users_dao.py +++ b/tests/app/dao/test_users_dao.py @@ -43,7 +43,7 @@ from tests.app.db import ( ('+1-800-555-5555', '+18005555555'), ]) def test_create_user(notify_db_session, phone_number, expected_phone_number): - email = 'notify@digital.cabinet-office.gov.uk' + email = 'notify@digital.fake.gov' data = { 'name': 'Test User', 'email_address': email, @@ -227,7 +227,7 @@ def test_dao_archive_user(sample_user, sample_organization, fake_uuid): assert sample_user.services == [] assert sample_user.organizations == [] assert sample_user.auth_type == EMAIL_AUTH_TYPE - assert sample_user.email_address == '_archived_2018-07-07_notify@digital.cabinet-office.gov.uk' + assert sample_user.email_address == '_archived_2018-07-07_notify@digital.fake.gov' assert sample_user.mobile_number is None assert sample_user.current_session_id == uuid.UUID('00000000-0000-0000-0000-000000000000') assert sample_user.state == 'inactive' diff --git a/tests/app/db.py b/tests/app/db.py index 636dedb3f..2fdfd2c0a 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -710,7 +710,7 @@ def create_service_guest_list(service, email_address=None, mobile_number=None): elif mobile_number: guest_list_user = ServiceGuestList.from_string(service.id, MOBILE_TYPE, mobile_number) else: - guest_list_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'guest_list_user@digital.gov.uk') + guest_list_user = ServiceGuestList.from_string(service.id, EMAIL_TYPE, 'guest_list_user@digital.fake.gov') db.session.add(guest_list_user) db.session.commit() @@ -820,7 +820,7 @@ def create_invited_user(service=None, if service is None: service = create_service() if to_email_address is None: - to_email_address = 'invited_user@digital.gov.uk' + to_email_address = 'invited_user@digital.fake.gov' from_user = service.users[0] diff --git a/tests/app/organization/test_rest.py b/tests/app/organization/test_rest.py index ae7e9318c..401cd6d08 100644 --- a/tests/app/organization/test_rest.py +++ b/tests/app/organization/test_rest.py @@ -518,7 +518,7 @@ def test_post_update_organization_set_mou_doesnt_email_if_no_signed_by( None, None, { - 'MOU_SIGNER_RECEIPT_TEMPLATE_ID': 'notify@digital.cabinet-office.gov.uk', + 'MOU_SIGNER_RECEIPT_TEMPLATE_ID': 'notify@digital.fake.gov', } ), ( @@ -526,7 +526,7 @@ def test_post_update_organization_set_mou_doesnt_email_if_no_signed_by( 'important@person.com', { 'MOU_SIGNED_ON_BEHALF_ON_BEHALF_RECEIPT_TEMPLATE_ID': 'important@person.com', - 'MOU_SIGNED_ON_BEHALF_SIGNER_RECEIPT_TEMPLATE_ID': 'notify@digital.cabinet-office.gov.uk', + 'MOU_SIGNED_ON_BEHALF_SIGNER_RECEIPT_TEMPLATE_ID': 'notify@digital.fake.gov', } ), ]) diff --git a/tests/app/service/send_notification/test_send_notification.py b/tests/app/service/send_notification/test_send_notification.py index 6b230d786..cdbd8e8ba 100644 --- a/tests/app/service/send_notification/test_send_notification.py +++ b/tests/app/service/send_notification/test_send_notification.py @@ -925,7 +925,7 @@ def test_should_send_notification_to_guest_list_recipient( @pytest.mark.parametrize( 'notification_type, template_type, to', [ - (EMAIL_TYPE, SMS_TYPE, 'notify@digital.cabinet-office.gov.uk'), + (EMAIL_TYPE, SMS_TYPE, 'notify@digital.fake.gov'), (SMS_TYPE, EMAIL_TYPE, '+12028675309') ]) def test_should_error_if_notification_type_does_not_match_template_type( @@ -1177,7 +1177,7 @@ def test_should_not_allow_email_notifications_if_service_permission_not_set( mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') data = { - 'to': 'notify@digital.cabinet-office.gov.uk', + 'to': 'notify@digital.fake.gov', 'template': str(sample_template_without_email_permission.id) } diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 58d297692..4501e5b68 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -192,7 +192,7 @@ def test_get_live_services_data(sample_user, admin_request): assert response == [ { 'consent_to_research': None, - 'contact_email': 'notify@digital.cabinet-office.gov.uk', + 'contact_email': 'notify@digital.fake.gov', 'contact_mobile': '+12028675309', 'contact_name': 'Test User', 'email_totals': 1, @@ -208,7 +208,7 @@ def test_get_live_services_data(sample_user, admin_request): }, { 'consent_to_research': None, - 'contact_email': 'notify@digital.cabinet-office.gov.uk', + 'contact_email': 'notify@digital.fake.gov', 'contact_mobile': '+12028675309', 'contact_name': 'Test User', 'email_totals': 0, @@ -417,7 +417,7 @@ def test_create_service_with_domain_sets_organization( create_domain('test.gov.uk', org.id) another_org = create_organization(name='Another') - create_domain('cabinet-office.gov.uk', another_org.id) + create_domain('fake.gov', another_org.id) create_domain('cabinetoffice.gov.uk', another_org.id) sample_user.email_address = 'test@{}'.format(domain) @@ -1193,7 +1193,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( # add new user to service user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1255,7 +1255,7 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api, # they must exist in db first user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1301,7 +1301,7 @@ def test_add_existing_user_to_another_service_with_manage_permissions(notify_api # they must exist in db first user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1347,7 +1347,7 @@ def test_add_existing_user_to_another_service_with_folder_permissions(notify_api # they must exist in db first user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1387,7 +1387,7 @@ def test_add_existing_user_to_another_service_with_manage_api_keys(notify_api, # they must exist in db first user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1425,7 +1425,7 @@ def test_add_existing_user_to_non_existing_service_returns404(notify_api, with notify_api.test_client() as client: user_to_add = User( name='Invited User', - email_address='invited@digital.cabinet-office.gov.uk', + email_address='invited@digital.fake.gov', password='password', mobile_number='+4477123456' ) @@ -1497,7 +1497,7 @@ def test_add_unknown_user_to_service_returns404(notify_api, notify_db_session, s def test_remove_user_from_service( client, sample_user_service_permission ): - second_user = create_user(email="new@digital.cabinet-office.gov.uk") + second_user = create_user(email="new@digital.fake.gov") service = sample_user_service_permission.service # Simulates successfully adding a user to the service @@ -1521,7 +1521,7 @@ def test_remove_user_from_service( def test_remove_non_existant_user_from_service( client, sample_user_service_permission ): - second_user = create_user(email="new@digital.cabinet-office.gov.uk") + second_user = create_user(email="new@digital.fake.gov") endpoint = url_for( 'service.remove_user_from_service', service_id=str(sample_user_service_permission.service.id), diff --git a/tests/app/test_model.py b/tests/app/test_model.py index 1b389ca3b..f98e3dbc5 100644 --- a/tests/app/test_model.py +++ b/tests/app/test_model.py @@ -338,7 +338,7 @@ def test_repr(): assert "has service permission" in sp.__repr__() sgl = create_service_guest_list(service) - assert sgl.__repr__() == 'Recipient guest_list_user@digital.gov.uk of type: email' + assert sgl.__repr__() == 'Recipient guest_list_user@digital.fake.gov of type: email' def test_verify_code(): @@ -349,7 +349,7 @@ def test_verify_code(): def test_notification_get_created_by_email_address(sample_notification, sample_user): sample_notification.created_by_id = sample_user.id - assert sample_notification.get_created_by_email_address() == 'notify@digital.cabinet-office.gov.uk' + assert sample_notification.get_created_by_email_address() == 'notify@digital.fake.gov' def test_notification_history_from_original(sample_notification): diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 7e888f082..c3633f40c 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -113,7 +113,7 @@ def test_post_user(admin_request, notify_db_session): User.query.delete() data = { "name": "Test User", - "email_address": "user@digital.cabinet-office.gov.uk", + "email_address": "user@digital.fake.gov", "password": "password", "mobile_number": "+12028675309", "logged_in_at": None, @@ -124,7 +124,7 @@ def test_post_user(admin_request, notify_db_session): } json_resp = admin_request.post('user.create_user', _data=data, _expected_status=201) - user = User.query.filter_by(email_address='user@digital.cabinet-office.gov.uk').first() + user = User.query.filter_by(email_address='user@digital.fake.gov').first() assert user.check_password("password") assert json_resp['data']['email_address'] == user.email_address assert json_resp['data']['id'] == str(user.id) @@ -135,7 +135,7 @@ def test_post_user_without_auth_type(admin_request, notify_db_session): User.query.delete() data = { "name": "Test User", - "email_address": "user@digital.cabinet-office.gov.uk", + "email_address": "user@digital.fake.gov", "password": "password", "mobile_number": "+12028675309", "permissions": {}, @@ -143,7 +143,7 @@ def test_post_user_without_auth_type(admin_request, notify_db_session): json_resp = admin_request.post('user.create_user', _data=data, _expected_status=201) - user = User.query.filter_by(email_address='user@digital.cabinet-office.gov.uk').first() + user = User.query.filter_by(email_address='user@digital.fake.gov').first() assert json_resp['data']['id'] == str(user.id) assert user.auth_type == SMS_AUTH_TYPE @@ -175,7 +175,7 @@ def test_create_user_missing_attribute_password(admin_request, notify_db_session User.query.delete() data = { "name": "Test User", - "email_address": "user@digital.cabinet-office.gov.uk", + "email_address": "user@digital.fake.gov", "mobile_number": "+12028675309", "logged_in_at": None, "state": "active", @@ -190,7 +190,7 @@ def test_create_user_missing_attribute_password(admin_request, notify_db_session def test_can_create_user_with_email_auth_and_no_mobile(admin_request, notify_db_session): data = { 'name': 'Test User', - 'email_address': 'user@digital.cabinet-office.gov.uk', + 'email_address': 'user@digital.fake.gov', 'password': 'password', 'mobile_number': None, 'auth_type': EMAIL_AUTH_TYPE @@ -205,7 +205,7 @@ def test_can_create_user_with_email_auth_and_no_mobile(admin_request, notify_db_ def test_cannot_create_user_with_sms_auth_and_no_mobile(admin_request, notify_db_session): data = { 'name': 'Test User', - 'email_address': 'user@digital.cabinet-office.gov.uk', + 'email_address': 'user@digital.fake.gov', 'password': 'password', 'mobile_number': None, 'auth_type': SMS_AUTH_TYPE @@ -272,7 +272,7 @@ def test_post_user_attribute(admin_request, sample_user, user_attribute, user_va api_key_id=None, key_type='normal', notification_type='sms', personalisation={ 'name': 'Test User', 'servicemanagername': 'Service Manago', - 'email address': 'notify@digital.cabinet-office.gov.uk' + 'email address': 'notify@digital.fake.gov' }, recipient='+4407700900460', reply_to_text='testing', service=mock.ANY, template_id=uuid.UUID('8a31520f-4751-4789-8ea1-fe54496725eb'), template_version=1 @@ -282,7 +282,7 @@ def test_post_user_attribute_with_updated_by( admin_request, mocker, sample_user, user_attribute, user_value, arguments, team_member_email_edit_template, team_member_mobile_edit_template ): - updater = create_user(name="Service Manago", email="notify_manago@digital.cabinet-office.gov.uk") + updater = create_user(name="Service Manago", email="notify_manago@digital.fake.gov") assert getattr(sample_user, user_attribute) != user_value update_dict = { user_attribute: user_value, @@ -377,7 +377,7 @@ def test_get_user_by_email(admin_request, sample_service): def test_get_user_by_email_not_found_returns_404(admin_request, sample_user): json_resp = admin_request.get( 'user.get_by_email', - email='no_user@digital.gov.uk', + email='no_user@digital.fake.gov', _expected_status=404 ) assert json_resp['result'] == 'error' @@ -627,12 +627,12 @@ def test_send_user_reset_password_should_send_reset_password_link(admin_request, @pytest.mark.parametrize('data, expected_url', ( ({ - 'email': 'notify@digital.cabinet-office.gov.uk', + 'email': 'notify@digital.fake.gov', }, ( 'http://localhost:6012/new-password/' )), ({ - 'email': 'notify@digital.cabinet-office.gov.uk', + 'email': 'notify@digital.fake.gov', 'admin_base_url': 'https://different.example.com', }, ( 'https://different.example.com/new-password/'