From 844f22bcd023c31cf32b32ad7cf3378e99fadf57 Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Tue, 21 May 2019 15:51:37 +0100
Subject: [PATCH] Remove unused fixture and add test function to create
 permissions

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

diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index e1e98605d..9ca2f2646 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -770,33 +770,6 @@ def sample_invited_org_user(
     return create_invited_org_user(sample_organisation, sample_user)
 
 
-@pytest.fixture(scope='function')
-def sample_permission(notify_db,
-                      notify_db_session,
-                      service=None,
-                      user=None,
-                      permission="manage_settings"):
-    if user is None:
-        user = create_user()
-    data = {
-        'user': user,
-        'permission': permission
-    }
-    if service is None:
-        service = create_service(check_if_service_exists=True)
-    if service:
-        data['service'] = service
-    p_model = Permission.query.filter_by(
-        user=user,
-        service=service,
-        permission=permission).first()
-    if not p_model:
-        p_model = Permission(**data)
-        db.session.add(p_model)
-        db.session.commit()
-    return p_model
-
-
 @pytest.fixture(scope='function')
 def sample_user_service_permission(
     notify_db, notify_db_session, service=None, user=None, permission="manage_settings"
diff --git a/tests/app/db.py b/tests/app/db.py
index 50a3a8560..bb388272b 100644
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -13,6 +13,7 @@ from app.dao.notifications_dao import (
     dao_created_scheduled_notification
 )
 from app.dao.organisation_dao import dao_create_organisation
+from app.dao.permissions_dao import permission_dao
 from app.dao.service_callback_api_dao import save_service_callback_api
 from app.dao.service_data_retention_dao import insert_service_data_retention
 from app.dao.service_inbound_api_dao import save_service_inbound_api
@@ -31,6 +32,7 @@ from app.models import (
     EmailBranding,
     LetterRate,
     Organisation,
+    Permission,
     Rate,
     Service,
     ServiceEmailReplyTo,
@@ -81,6 +83,15 @@ def create_user(
     return user
 
 
+def create_permissions(user, service, *permissions):
+    permissions = [
+        Permission(service_id=service.id, user_id=user.id, permission=p)
+        for p in permissions
+    ]
+
+    permission_dao.set_user_service_permission(user, service, permissions)
+
+
 def create_service(
         user=None,
         service_name="Sample service",