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

Refactor to add separate letter branding client

Browse Source 
We were getting all letter logos from a method in the email branding
client. Since we will be adding more client methods to deal with
letters, it makes things clearer to separate the email and letter
branding clients.
This commit is contained in:
Katie Smith
2019-01-23 12:27:14 +00:00
parent 284ec3ee3e
commit 0bf3a4b16d
10 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/main/views/service_settings/test_service_setting_permissions.py
View File

@@ -10,7 +10,7 @@ def get_service_settings_page(
platform_admin_user,
service_one,
mock_get_inbound_number_for_service,
mock_get_letter_email_branding,
mock_get_letter_branding,
mock_get_service_organisation,
mock_get_free_sms_fragment_limit,
no_reply_to_email_addresses,
@@ -113,7 +113,7 @@ def test_normal_user_doesnt_see_any_toggle_buttons(
no_letter_contact_blocks,
mock_get_service_organisation,
single_sms_sender,
mock_get_letter_email_branding,
mock_get_letter_branding,
mock_get_inbound_number_for_service,
mock_get_free_sms_fragment_limit,
mock_get_service_data_retention

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

@@ -38,7 +38,7 @@ from tests.conftest import (
@pytest.fixture
def mock_get_service_settings_page_common(
mock_get_letter_email_branding,
mock_get_letter_branding,
mock_get_inbound_number_for_service,
mock_get_free_sms_fragment_limit,
mock_get_service_data_retention,
@@ -1216,7 +1216,7 @@ def test_route_for_platform_admin_update_service(
client,
platform_admin_user,
service_one,
mock_get_letter_email_branding,
mock_get_letter_branding,
route,
):
mocker.patch('app.service_api_client.archive_service')
@@ -2142,7 +2142,7 @@ def test_set_letter_contact_block_has_max_10_lines(
def test_request_letter_branding(
client_request,
mock_get_letter_email_branding,
mock_get_letter_branding,
):
request_page = client_request.get(
'main.request_letter_branding',
@@ -2186,7 +2186,7 @@ def test_set_letter_branding_platform_admin_only(
def test_set_letter_branding_prepopulates(
logged_in_platform_admin_client,
service_one,
mock_get_letter_email_branding,
mock_get_letter_branding,
current_dvla_org_id,
expected_selected,
expected_items,
@@ -2213,7 +2213,7 @@ def test_set_letter_branding_saves(
logged_in_platform_admin_client,
service_one,
mock_update_service,
mock_get_letter_email_branding,
mock_get_letter_branding,
):
response = logged_in_platform_admin_client.post(
url_for('main.set_letter_branding', service_id=service_one['id']),
@@ -3098,7 +3098,7 @@ def test_service_settings_when_inbound_number_is_not_set(
mock_get_service_organisation,
single_sms_sender,
mocker,
mock_get_letter_email_branding,
mock_get_letter_branding,
mock_get_free_sms_fragment_limit,
mock_get_service_data_retention,
):
@@ -3116,7 +3116,7 @@ def test_set_inbound_sms_when_inbound_number_is_not_set(
single_reply_to_email_address,
single_letter_contact_block,
mocker,
mock_get_letter_email_branding,
mock_get_letter_branding,
):
mocker.patch('app.inbound_number_client.get_inbound_sms_number_for_service',
return_value={'data': {}})