From d4225de45e56382530363457ea53a2f4485d767d Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Mon, 16 May 2016 11:53:22 +0100
Subject: [PATCH] Update json structure for unit tests.

---
 app/main/views/jobs.py |  4 +++-
 tests/__init__.py      | 10 ++++++----
 tests/conftest.py      |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 05785a6b1..bb8275d2f 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -57,7 +57,9 @@ def view_jobs(service_id):
 @user_has_permissions('view_activity', admin_override=True)
 def view_job(service_id, job_id):
     job = job_api_client.get_job(service_id, job_id)['data']
-    template = service_api_client.get_service_template(service_id, job['template'], job['template_version'])['data']
+    template = service_api_client.get_service_template(service_id=service_id,
+                                                       template_id=job['template'],
+                                                       version=job['template_version'])['data']
     notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
     finished = job['status'] == 'finished'
     return render_template(
diff --git a/tests/__init__.py b/tests/__init__.py
index d12d9990c..707aaa60e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -53,14 +53,14 @@ def template_json(service_id,
                   type_="sms",
                   content="template content",
                   subject=None,
-                  versions=['1']):
+                  versions='1'):
     template = {
         'id': id_,
         'name': name,
         'template_type': type_,
         'content': content,
         'service': service_id,
-        'versions': versions
+        'version': versions
     }
     if subject is not None:
         template['subject'] = subject
@@ -83,7 +83,6 @@ def template_version_json(service_id,
         created_at = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')
     template['created_at'] = created_at
     template['version'] = version
-    del template['versions']
     return template
 
 
@@ -129,6 +128,7 @@ def job_json():
         'id': job_id,
         'service': 1,
         'template': 1,
+        'template_version': 1,
         'original_file_name': 'thisisatest.csv',
         'created_at': created_at,
         'notification_count': 1,
@@ -143,6 +143,7 @@ def job_json_with_created_by(service_id=None, job_id=None):
         'id': job_id if job_id else str(generate_uuid()),
         'service': service_id if service_id else str(generate_uuid()),
         'template': 1,
+        'template_version': 1,
         'original_file_name': 'thisisatest.csv',
         'created_at': str(datetime.now().time()),
         'notification_count': 1,
@@ -190,7 +191,8 @@ def notification_json(service_id,
             'sent_at': sent_at,
             'status': status,
             'created_at': created_at,
-            'updated_at': updated_at
+            'updated_at': updated_at,
+            'template_version': template['version']
         } for i in range(5)],
         'total': 5,
         'page_size': 50,
diff --git a/tests/conftest.py b/tests/conftest.py
index 7a8104681..9bb87852f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -203,9 +203,11 @@ def mock_get_aggregate_service_statistics(mocker):
 
 @pytest.fixture(scope='function')
 def mock_get_service_template(mocker):
-    def _get(service_id, template_id):
+    def _get(service_id, template_id, version=None):
         template = template_json(
             service_id, template_id, "Two week reminder", "sms", "Your vehicle tax is about to expire")
+        if version:
+            template.update({'version': version})
         return {'data': template}
 
     return mocker.patch(