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

Refactor settings page to use service model

Browse Source 
There’s a lot of code in service settings which:
- talks to the API directly through the clients
- passes that information through to the Jinja template

By encapsulating this logic in the service model:
- the Jinja template can access the data directly
- the logic can be reused across multiple methods
This commit is contained in:
Chris Hill-Scott
2018-10-30 15:07:52 +00:00
parent 526f2d7900
commit 1e2608d2e0
12 changed files with 199 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/main/views/test_service_settings.py
+4 -4
View File
@@ -60,7 +60,7 @@ def mock_get_service_settings_page_common(
'Label Value Action',
'Send text messages On Change',
'Text message sender GOVUK Manage',
'Text message sender GOVUK Change',
'Text messages start with service name On Change',
'International text messages Off Change',
'Receive text messages Off Change',
@@ -82,7 +82,7 @@ def mock_get_service_settings_page_common(
'Label Value Action',
'Send text messages On Change',
'Text message sender GOVUK Manage',
'Text message sender GOVUK Change',
'Text messages start with service name On Change',
'International text messages Off Change',
'Receive text messages Off Change',
@@ -143,7 +143,7 @@ def test_should_show_overview(
'Label Value Action',
'Send text messages On Change',
'Text message sender GOVUK Manage',
'Text message sender GOVUK Change',
'Text messages start with service name On Change',
'International text messages On Change',
'Receive text messages On Change',
@@ -164,7 +164,7 @@ def test_should_show_overview(
'Label Value Action',
'Send text messages On Change',
'Text message sender GOVUK Manage',
'Text message sender GOVUK Change',
'Text messages start with service name On Change',
'International text messages Off Change',
'Receive text messages Off Change',
tests/conftest.py
+11 -7
View File
@@ -79,7 +79,10 @@ def multiple_reply_to_email_addresses(mocker):
}
]
return mocker.patch('app.service_api_client.get_reply_to_email_addresses', side_effect=_get)
return mocker.patch(
'app.notify_client.service_api_client.service_api_client.get_reply_to_email_addresses',
side_effect=_get,
)
@pytest.fixture(scope='function')
@@ -303,7 +306,7 @@ def multiple_sms_senders(mocker):
}
]
return mocker.patch('app.service_api_client.get_sms_senders', side_effect=_get)
return mocker.patch('app.notify_client.service_api_client.service_api_client.get_sms_senders', side_effect=_get)
@pytest.fixture(scope='function')
@@ -337,7 +340,7 @@ def multiple_sms_senders_with_diff_default(mocker):
}
]
return mocker.patch('app.service_api_client.get_sms_senders', side_effect=_get)
return mocker.patch('app.notify_client.service_api_client.service_api_client.get_sms_senders', side_effect=_get)
@pytest.fixture(scope='function')
@@ -363,7 +366,7 @@ def multiple_sms_senders_no_inbound(mocker):
}
]
return mocker.patch('app.service_api_client.get_sms_senders', side_effect=_get)
return mocker.patch('app.notify_client.service_api_client.service_api_client.get_sms_senders', side_effect=_get)
@pytest.fixture(scope='function')
@@ -389,7 +392,7 @@ def single_sms_sender(mocker):
}
]
return mocker.patch('app.service_api_client.get_sms_senders', side_effect=_get)
return mocker.patch('app.notify_client.service_api_client.service_api_client.get_sms_senders', side_effect=_get)
@pytest.fixture(scope='function')
@@ -405,7 +408,7 @@ def get_default_sms_sender(mocker):
'updated_at': None
}
return mocker.patch('app.service_api_client.get_sms_sender', side_effect=_get)
return mocker.patch('app.notify_client.service_api_client.service_api_client.get_sms_sender', side_effect=_get)
@pytest.fixture(scope='function')
@@ -2456,7 +2459,8 @@ def mock_get_all_email_branding(mocker):
return create_email_brandings(5, non_standard_values=non_standard_values, shuffle=shuffle)
return mocker.patch(
'app.email_branding_client.get_all_email_branding', side_effect=_get_all_email_branding
'app.notify_client.email_branding_client.email_branding_client.get_all_email_branding',
side_effect=_get_all_email_branding,
)