From 0bcf13d85cf1f5a22cc08810e231de4df803d6d6 Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Mon, 31 Dec 2018 15:16:00 +0000
Subject: [PATCH] sample_api_key uses create_service instead of sample_service

---
 tests/app/conftest.py | 2 +-
 tests/app/db.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index bca4f3776..cadced70d 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -350,7 +350,7 @@ def sample_api_key(notify_db,
                    key_type=KEY_TYPE_NORMAL,
                    name=None):
     if service is None:
-        service = sample_service(notify_db, notify_db_session)
+        service = create_service()
     data = {'service': service, 'name': name or uuid.uuid4(), 'created_by': service.created_by, 'key_type': key_type}
     api_key = ApiKey(**data)
     save_model_api_key(api_key)
diff --git a/tests/app/db.py b/tests/app/db.py
index ee17c48cd..d6d4b9553 100644
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -100,7 +100,7 @@ def create_service(
         service.active = active
         service.research_mode = research_mode
     else:
-        if user not in service.users:
+        if user and user not in service.users:
             dao_add_user_to_service(service, user)
 
     return service