tests: move admin_user fixture to conftests

tests/conftest.py

@@ -29,3 +29,12 @@ def jane_doe():
     except User.DoesNotExist:
         admin2 = User.objects.create_user('jane.doe', email='jane.doe@example.com', password='jane.doe')
     return admin2
+
+
+@pytest.fixture
+def admin_user():
+    try:
+        user = User.objects.get(username='admin')
+    except User.DoesNotExist:
+        user = User.objects.create_superuser('admin', email=None, password='admin')
+    return user

tests/test_cells.py

@@ -19,7 +19,7 @@ from django.utils.encoding import force_text
 from combo.data.library import get_cell_classes
 from combo.utils import NothingInCacheException
 
-from .test_manager import admin_user, login
+from .test_manager import login
 
 pytestmark = pytest.mark.django_db
 

tests/test_dashboard.py

@@ -18,7 +18,7 @@ from combo.apps.dashboard.models import DashboardCell, Tile
 
 pytestmark = pytest.mark.django_db
 
-from .test_manager import admin_user, login
+from .test_manager import login
 
 @pytest.fixture
 def site(admin_user):

tests/test_fargo.py

@@ -6,7 +6,7 @@ from django.test import override_settings
 
 from combo.apps.fargo.models import RecentDocumentsCell
 from combo.data.models import Page
-from .test_manager import login, admin_user
+from .test_manager import login
 
 pytestmark = pytest.mark.django_db
 

tests/test_lingo_manager.py

@@ -15,13 +15,6 @@ from decimal import Decimal
 
 pytestmark = pytest.mark.django_db
 
-@pytest.fixture
-def admin_user():
-    try:
-        user = User.objects.get(username='admin')
-    except User.DoesNotExist:
-        user = User.objects.create_superuser('admin', email=None, password='admin')
-    return user
 
 def login(app, username='admin', password='admin'):
     login_page = app.get('/login/')

tests/test_manager.py

@@ -30,14 +30,6 @@ pytestmark = pytest.mark.django_db
 
 TESTS_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
-@pytest.fixture
-def admin_user():
-    try:
-        user = User.objects.get(username='admin')
-    except User.DoesNotExist:
-        user = User.objects.create_superuser('admin', email=None, password='admin')
-    return user
-
 @pytest.fixture
 def clean_media():
     for path in ('uploads', 'assets'):

tests/test_maps_manager.py

@@ -9,13 +9,6 @@ from combo.apps.maps.models import MapLayer
 
 pytestmark = pytest.mark.django_db
 
-@pytest.fixture
-def admin_user():
-    try:
-        user = User.objects.get(username='admin')
-    except User.DoesNotExist:
-        user = User.objects.create_superuser('admin', email=None, password='admin')
-    return user
 
 def login(app, username='admin', password='admin'):
     login_page = app.get('/login/')

tests/test_momo.py

@@ -9,7 +9,7 @@ from django.conf import settings
 
 from combo.data.models import Page, CellBase, TextCell, LinkCell, FeedCell
 
-from .test_manager import login, admin_user
+from .test_manager import login
 
 pytestmark = pytest.mark.django_db
 

tests/test_public.py

@@ -23,7 +23,7 @@ from combo.apps.family.models import FamilyInfosCell
 
 pytestmark = pytest.mark.django_db
 
-from .test_manager import admin_user, login
+from .test_manager import login
 
 @pytest.fixture
 def normal_user():

tests/test_search.py

@@ -16,7 +16,7 @@ from combo.apps.search.models import SearchCell
 from combo.data.models import Page, JsonCell, TextCell, MenuCell, LinkCell
 from combo.data.search_indexes import PageIndex
 
-from .test_manager import admin_user, login
+from .test_manager import login
 
 
 pytestmark = pytest.mark.django_db

tests/test_wcs.py

@@ -25,7 +25,7 @@ from combo.apps.wcs.models import (WcsFormCell, WcsCurrentFormsCell,
 
 from combo.utils import NothingInCacheException
 
-from .test_manager import login, admin_user
+from .test_manager import login
 
 pytestmark = pytest.mark.django_db