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

Make fixtures more DRY

Browse Source 
Moves a commonly used fixture into
`mock_get_service_settings_page_common` so we don't need to keep writing
it every time.

Note, we may be able to do similar in the future with

- single_reply_to_email_address
- single_letter_contact_block
- single_sms_sender

but need a bit more thought about fixing tests that would fail due to
this change and need tweaks to the order of their arguments.
This commit is contained in:
David McDonald
2021-02-22 15:51:35 +00:00
parent f8f3d44511
commit d22a852b5e
1 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/app/main/views/test_service_settings.py
View File

@@ -48,6 +48,7 @@ def mock_get_service_settings_page_common(
mock_get_inbound_number_for_service,
mock_get_free_sms_fragment_limit,
mock_get_service_data_retention,
mock_get_organisation,
):
return
@@ -121,7 +122,6 @@ def test_should_show_overview(
api_user_active,
no_reply_to_email_addresses,
no_letter_contact_blocks,
mock_get_organisation,
single_sms_sender,
user,
expected_rows,
@@ -156,7 +156,6 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service(
api_user_active,
no_reply_to_email_addresses,
no_letter_contact_blocks,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -215,7 +214,6 @@ def test_platform_admin_sees_correct_description_of_broadcast_service_setting(
api_user_active,
no_reply_to_email_addresses,
no_letter_contact_blocks,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
has_broadcast_permission,
@@ -277,7 +275,6 @@ def test_organisation_name_links_to_org_dashboard(
single_sms_sender,
mock_get_service_settings_page_common,
mocker,
mock_get_organisation,
):
service_one = service_json(SERVICE_ONE_ID,
permissions=['sms', 'email'],
@@ -306,7 +303,6 @@ def test_send_files_by_email_row_on_settings_page(
single_sms_sender,
mock_get_service_settings_page_common,
mocker,
mock_get_organisation,
service_contact_link,
expected_text
):
@@ -406,7 +402,6 @@ def test_should_show_overview_for_service_with_more_things_set(
single_reply_to_email_address,
single_letter_contact_block,
single_sms_sender,
mock_get_organisation,
mock_get_email_branding,
mock_get_service_settings_page_common,
permissions,
@@ -428,7 +423,6 @@ def test_if_cant_send_letters_then_cant_see_letter_contact_block(
service_one,
single_reply_to_email_address,
no_letter_contact_blocks,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -441,7 +435,6 @@ def test_letter_contact_block_shows_none_if_not_set(
service_one,
single_reply_to_email_address,
no_letter_contact_blocks,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -462,7 +455,6 @@ def test_escapes_letter_contact_block(
mocker,
single_reply_to_email_address,
single_sms_sender,
mock_get_organisation,
injected_letter_contact_block,
mock_get_service_settings_page_common,
):
@@ -622,7 +614,6 @@ def test_show_restricted_service(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
user,
@@ -654,7 +645,6 @@ def test_show_restricted_broadcast_service(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -701,7 +691,6 @@ def test_show_live_service(
mock_get_live_service,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -2090,7 +2079,6 @@ def test_route_permissions(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
mock_get_invites_for_service,
single_sms_sender,
route,
@@ -2155,7 +2143,6 @@ def test_route_for_platform_admin(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
route,
mock_get_service_settings_page_common,
@@ -2180,7 +2167,6 @@ def test_and_more_hint_appears_on_settings_with_more_than_just_a_single_sender(
service_one,
multiple_reply_to_email_addresses,
multiple_letter_contact_blocks,
mock_get_organisation,
multiple_sms_senders,
mock_get_service_settings_page_common,
):
@@ -3238,7 +3224,6 @@ def test_shows_research_mode_indicator(
mocker,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -3258,7 +3243,6 @@ def test_does_not_show_research_mode_indicator(
client_request,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -4100,7 +4084,6 @@ def test_archive_service_prompts_user(
mocker,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
user,
@@ -4136,7 +4119,6 @@ def test_cant_archive_inactive_service(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common
):
@@ -4170,7 +4152,6 @@ def test_suspend_service_prompts_user(
mocker,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -4190,7 +4171,6 @@ def test_cant_suspend_inactive_service(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common,
):
@@ -4227,7 +4207,6 @@ def test_resume_service_prompts_user(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mocker,
mock_get_service_settings_page_common,
@@ -4249,7 +4228,6 @@ def test_cant_resume_active_service(
service_one,
single_reply_to_email_address,
single_letter_contact_block,
mock_get_organisation,
single_sms_sender,
mock_get_service_settings_page_common
):
@@ -4290,7 +4268,6 @@ def test_send_files_by_email_contact_details_updates_contact_details_and_redirec
service_one,
mock_update_service,
mock_get_service_settings_page_common,
mock_get_organisation,
no_reply_to_email_addresses,
no_letter_contact_blocks,
single_sms_sender,
@@ -4318,7 +4295,6 @@ def test_send_files_by_email_contact_details_uses_the_selected_field_when_multip
service_one,
mock_update_service,
mock_get_service_settings_page_common,
mock_get_organisation,
no_reply_to_email_addresses,
no_letter_contact_blocks,
single_sms_sender,
@@ -4412,7 +4388,6 @@ def test_contact_link_is_not_displayed_without_the_upload_document_permission(
client_request,
service_one,
mock_get_service_settings_page_common,
mock_get_organisation,
no_reply_to_email_addresses,
no_letter_contact_blocks,
single_sms_sender,
@@ -5213,7 +5188,6 @@ def test_service_settings_links_to_branding_request_page_for_letters(
no_letter_contact_blocks,
single_sms_sender,
mock_get_service_settings_page_common,
mock_get_organisation,
):
service_one["restricted"] is False
service_one['permissions'].append('letter')
@@ -5336,7 +5310,6 @@ def test_service_settings_links_to_edit_service_notes_page_for_platform_admins(
no_letter_contact_blocks,
single_sms_sender,
mock_get_service_settings_page_common,
mock_get_organisation,
):
response = platform_admin_client.get(url_for(
'.service_settings', service_id=SERVICE_ONE_ID
@@ -5384,7 +5357,6 @@ def test_service_settings_links_to_edit_service_billing_details_page_for_platfor
no_letter_contact_blocks,
single_sms_sender,
mock_get_service_settings_page_common,
mock_get_organisation,
):
response = platform_admin_client.get(url_for(
'.service_settings', service_id=SERVICE_ONE_ID