Merge pull request #2180 from alphagov/service-model

Make a service model

tests/app/main/views/test_api_integration.py

@@ -487,6 +487,7 @@ def test_should_validate_whitelist_items(
 def test_callback_forms_validation(
     client_request,
     service_one,
+    mock_get_valid_service_callback_api,
     endpoint,
     url,
     bearer_token,
@@ -606,7 +607,8 @@ def test_callbacks_button_links_straight_to_delivery_status_if_service_has_no_in
 def test_callbacks_page_redirects_to_delivery_status_if_service_has_no_inbound_sms(
     client_request,
     service_one,
-    mocker
+    mocker,
+    mock_get_valid_service_callback_api,
 ):
     page = client_request.get(
         'main.api_callbacks',

tests/app/main/views/test_service_settings.py

@@ -2039,8 +2039,10 @@ def test_service_switch_can_upload_document_changes_the_permission_if_not_adding
         follow_redirects=True
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-
-    assert service_one['permissions'] == end_permissions
+    mock_update_service.assert_called_once_with(
+        SERVICE_ONE_ID,
+        permissions=end_permissions,
+    )
     assert page.h1.text.strip() == 'Settings'
 
 
@@ -2080,7 +2082,7 @@ def test_service_switch_can_upload_document_lets_contact_link_be_added_and_switc
     )
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
-    assert 'upload_document' in service_one['permissions']
+    assert 'upload_document' in mock_update_service.call_args[1]['permissions']
     assert page.h1.text.strip() == 'Settings'
 
 

tests/app/test_template_previews.py

@@ -49,7 +49,7 @@ def test_from_database_object_makes_request(
 ):
     resp = Mock(content='a', status_code='b', headers={'c': 'd'})
     request_mock = mocker.patch('app.template_previews.requests.post', return_value=resp)
-    mocker.patch('app.template_previews.current_service', __getitem__=Mock(return_value='123'))
+    mocker.patch('app.template_previews.current_service', dvla_organisation='123')
     template = mock_get_service_letter_template('123', '456')['data']
 
     ret = partial_call(template=template)