From e1b66eed43d10f931c6f8aca78d043fbfca3cad6 Mon Sep 17 00:00:00 2001
From: Ricky Cook <ricky@spruce.sh>
Date: Wed, 13 Jul 2016 17:43:46 +1000
Subject: [PATCH] Fix tests

---
 tests/conftest.py                  |  1 +
 tests/db/api/test_user_api_db.py   | 23 +++++++----------------
 tests/db/models/test_project_db.py | 12 +++++++++++-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index c9bd851..9345d58 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -140,6 +140,7 @@ def project(db, randid):
         name=randid,
         repo='test',
         utility=False,
+        public=True
     ), delete=True) as model:
         yield model
 
diff --git a/tests/db/api/test_user_api_db.py b/tests/db/api/test_user_api_db.py
index 6b8c7b0..6e4dd8e 100644
--- a/tests/db/api/test_user_api_db.py
+++ b/tests/db/api/test_user_api_db.py
@@ -20,30 +20,22 @@ def test_add_to_empty(self):
         assert [role.name for role in user.roles] == ['admin']
 
     @pytest.mark.usefixtures('db')
-    def test_add_multiple(self):
+    def test_add_multiple(self, role):
         """ Add multiple roles to a user with no roles """
-        role = Role(name='test')
-        DB.session.add(role)
-        DB.session.commit()
-
         user = User()
-        rest_set_roles(user, ['admin', 'test'])
-        assert [role.name for role in user.roles] == ['admin', 'test']
+        rest_set_roles(user, ['admin', role.name])
+        assert [role.name for role in user.roles] == ['admin', role.name]
 
     @pytest.mark.usefixtures('db')
-    def test_set_with_existing(self):
+    def test_set_with_existing(self, role, user):
         """ Set roles on a user with an existing role """
-        role = Role(name='test')
-        user = SECURITY_STATE.datastore.create_user(
-            email='test@example.com',
-        )
-        user.roles.append(Role.query.get(1))
+        user.roles.append(role)
         DB.session.add(role)
         DB.session.add(user)
         DB.session.commit()
 
-        rest_set_roles(user, ['test'])
-        assert [role.name for role in user.roles] == ['test']
+        rest_set_roles(user, [role.name])
+        assert [role.name for role in user.roles] == [role.name]
 
     @pytest.mark.usefixtures('db')
     def test_add_fake(self):
@@ -110,7 +102,6 @@ def test_no_admin_update_roles(self, client, user, role):
             'roles': [role.name],
         })
 
-        print(response.data)
         assert response.status_code == 401
 
         DB.session.refresh(user)
diff --git a/tests/db/models/test_project_db.py b/tests/db/models/test_project_db.py
index aa233aa..529fc55 100644
--- a/tests/db/models/test_project_db.py
+++ b/tests/db/models/test_project_db.py
@@ -1,6 +1,6 @@
 import pytest
 
-from dockci.models.job import Job
+from dockci.models.job import Job, JobStageTmp
 from dockci.models.project import Project
 from dockci.server import DB
 
@@ -12,6 +12,7 @@ def create_project(slug, **kwargs):
         slug=slug,
         utility=False,
         repo='test',
+        public=True,
     )
     final_kwargs.update(kwargs)
     return Project(**final_kwargs)
@@ -30,6 +31,14 @@ def create_job(**kwargs):
 class TestProjectsSummary(object):
     """ Ensure ``Project.get_status_summary`` behaves as expected """
 
+    def setup_method(self, _):
+        JobStageTmp.query.delete()
+        Job.query.delete()
+    def teardown_method(self, _):
+        JobStageTmp.query.delete()
+        Job.query.delete()
+
+
     @pytest.mark.parametrize('models,p_filters,exp_s,exp_f,exp_b,exp_i', [
         (
             (
@@ -111,6 +120,7 @@ def test_it(self, db, models, p_filters, exp_s, exp_f, exp_b, exp_i):
             for job in jobs:
                 job.project = project
                 DB.session.add(job)
+                print('job')
 
         DB.session.commit()