From 76676280abb455ada3d477fe66f3a72115e5736a Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Thu, 20 Apr 2017 17:22:45 +0100
Subject: [PATCH] add create service tests for dvla_org

---
 tests/app/service/test_rest.py | 94 +++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py
index d04cd5f36..43edbc040 100644
--- a/tests/app/service/test_rest.py
+++ b/tests/app/service/test_rest.py
@@ -129,21 +129,20 @@ def test_get_service_list_should_return_empty_list_if_no_services(notify_api, no
             assert len(json_resp['data']) == 0
 
 
-def test_get_service_by_id(notify_api, sample_service):
-    with notify_api.test_request_context():
-        with notify_api.test_client() as client:
-            auth_header = create_authorization_header()
-            resp = client.get(
-                '/service/{}'.format(sample_service.id),
-                headers=[auth_header]
-            )
-            assert resp.status_code == 200
-            json_resp = json.loads(resp.get_data(as_text=True))
-            assert json_resp['data']['name'] == sample_service.name
-            assert json_resp['data']['id'] == str(sample_service.id)
-            assert not json_resp['data']['research_mode']
-            assert json_resp['data']['organisation'] is None
-            assert json_resp['data']['branding'] == 'govuk'
+def test_get_service_by_id(client, sample_service):
+    auth_header = create_authorization_header()
+    resp = client.get(
+        '/service/{}'.format(sample_service.id),
+        headers=[auth_header]
+    )
+    assert resp.status_code == 200
+    json_resp = json.loads(resp.get_data(as_text=True))
+    assert json_resp['data']['name'] == sample_service.name
+    assert json_resp['data']['id'] == str(sample_service.id)
+    assert not json_resp['data']['research_mode']
+    assert json_resp['data']['organisation'] is None
+    assert json_resp['data']['branding'] == 'govuk'
+    assert json_resp['data']['dvla_organisation'] == '001'
 
 
 def test_get_service_by_id_should_404_if_no_service(notify_api, notify_db):
@@ -191,41 +190,40 @@ def test_get_service_by_id_should_404_if_no_service_for_user(notify_api, sample_
             assert json_resp['message'] == 'No result found'
 
 
-def test_create_service(notify_api, sample_user):
-    with notify_api.test_request_context():
-        with notify_api.test_client() as client:
-            data = {
-                'name': 'created service',
-                'user_id': str(sample_user.id),
-                'message_limit': 1000,
-                'restricted': False,
-                'active': False,
-                'email_from': 'created.service',
-                'created_by': str(sample_user.id)}
-            auth_header = create_authorization_header()
-            headers = [('Content-Type', 'application/json'), auth_header]
-            resp = client.post(
-                '/service',
-                data=json.dumps(data),
-                headers=headers)
-            json_resp = json.loads(resp.get_data(as_text=True))
-            assert resp.status_code == 201
-            assert json_resp['data']['id']
-            assert json_resp['data']['name'] == 'created service'
-            assert json_resp['data']['email_from'] == 'created.service'
-            assert not json_resp['data']['research_mode']
+def test_create_service(client, sample_user):
+    data = {
+        'name': 'created service',
+        'user_id': str(sample_user.id),
+        'message_limit': 1000,
+        'restricted': False,
+        'active': False,
+        'email_from': 'created.service',
+        'created_by': str(sample_user.id)}
+    auth_header = create_authorization_header()
+    headers = [('Content-Type', 'application/json'), auth_header]
+    resp = client.post(
+        '/service',
+        data=json.dumps(data),
+        headers=headers)
+    json_resp = json.loads(resp.get_data(as_text=True))
+    assert resp.status_code == 201
+    assert json_resp['data']['id']
+    assert json_resp['data']['name'] == 'created service'
+    assert json_resp['data']['email_from'] == 'created.service'
+    assert not json_resp['data']['research_mode']
+    assert json_resp['data']['dvla_organisation'] == '001'
 
-            auth_header_fetch = create_authorization_header()
+    auth_header_fetch = create_authorization_header()
 
-            resp = client.get(
-                '/service/{}?user_id={}'.format(json_resp['data']['id'], sample_user.id),
-                headers=[auth_header_fetch]
-            )
-            assert resp.status_code == 200
-            json_resp = json.loads(resp.get_data(as_text=True))
-            assert json_resp['data']['name'] == 'created service'
-            assert not json_resp['data']['research_mode']
-            assert not json_resp['data']['can_send_letters']
+    resp = client.get(
+        '/service/{}?user_id={}'.format(json_resp['data']['id'], sample_user.id),
+        headers=[auth_header_fetch]
+    )
+    assert resp.status_code == 200
+    json_resp = json.loads(resp.get_data(as_text=True))
+    assert json_resp['data']['name'] == 'created service'
+    assert not json_resp['data']['research_mode']
+    assert not json_resp['data']['can_send_letters']
 
 
 def test_should_not_create_service_with_missing_user_id_field(notify_api, fake_uuid):