moved user/admin tests to MisagoTestCase so they won't leak state to each other #568

misago/admin/testutils.py

@@ -5,7 +5,7 @@ from misago.users.testutils import SuperUserTestCase
 
 class AdminTestCase(SuperUserTestCase):
     def setUp(self):
-        self.user = self.get_superuser()
+        super(AdminTestCase, self).setUp()
         self.login_admin(self.user)
 
     def login_admin(self, user):

misago/categories/tests/test_categories_admin_views.py

@@ -1,19 +1,9 @@
 from django.core.urlresolvers import reverse
-
 from misago.admin.testutils import AdminTestCase
-from misago.core import threadstore
-from misago.core.cache import cache
-
 from misago.categories.models import Category
 
 
 class CategoryAdminViewsTests(AdminTestCase):
-    def setUp(self):
-        super(CategoryAdminViewsTests, self).setUp()
-
-        cache.clear()
-        threadstore.clear()
-
     def test_link_registered(self):
         """admin nav contains categories link"""
         response = self.client.get(

misago/categories/tests/test_category_model.py

@@ -1,12 +1,12 @@
-from django.test import TestCase
 from django.utils import timezone
 
+from misago.core.testutils import MisagoTestCase
 from misago.threads import testutils
 
 from misago.categories.models import CATEGORIES_TREE_ID, Category
 
 
-class CategoryManagerTests(TestCase):
+class CategoryManagerTests(MisagoTestCase):
     def test_private_threads(self):
         """private_threads returns private threads category"""
         category = Category.objects.private_threads()
@@ -45,8 +45,10 @@ class CategoryManagerTests(TestCase):
                 self.assertNotIn(category.id, test_dict)
 
 
-class CategoryModelTests(TestCase):
+class CategoryModelTests(MisagoTestCase):
     def setUp(self):
+        super(CategoryModelTests, self).setUp()
+
         self.category = Category.objects.all_categories()[:1][0]
 
     def create_thread(self):

misago/categories/tests/test_permissions_admin_views.py

@@ -3,8 +3,6 @@ from django.core.urlresolvers import reverse
 from misago.acl.models import Role
 from misago.acl.testutils import fake_post_data
 from misago.admin.testutils import AdminTestCase
-from misago.core import threadstore
-from misago.core.cache import cache
 
 from misago.categories.models import Category, CategoryRole
 
@@ -14,12 +12,6 @@ def fake_data(data_dict):
 
 
 class CategoryRoleAdminViewsTests(AdminTestCase):
-    def setUp(self):
-        super(CategoryRoleAdminViewsTests, self).setUp()
-
-        cache.clear()
-        threadstore.clear()
-
     def test_link_registered(self):
         """admin nav contains category roles link"""
         response = self.client.get(

misago/core/tests/test_cachebuster.py

@@ -1,11 +1,10 @@
-from django.test import TestCase
-
 from misago.core import cachebuster, threadstore
 from misago.core.cache import cache
 from misago.core.models import CacheVersion
+from misago.core.testutils import MisagoTestCase
 
 
-class CacheBusterTests(TestCase):
+class CacheBusterTests(MisagoTestCase):
     def test_register_unregister_cache(self):
         """register and unregister adds/removes cache"""
         test_cache_name = 'eric_the_fish'
@@ -20,10 +19,9 @@ class CacheBusterTests(TestCase):
             CacheVersion.objects.get(cache=test_cache_name)
 
 
-class CacheBusterCacheTests(TestCase):
+class CacheBusterCacheTests(MisagoTestCase):
     def setUp(self):
-        cache.clear()
-        threadstore.clear()
+        super(CacheBusterCacheTests, self).setUp()
 
         self.cache_name = 'eric_the_fish'
         cachebuster.register(self.cache_name)

misago/threads/tests/test_utils.py

@@ -1,20 +1,14 @@
-from django.test import TestCase
-
+from misago.core.testutils import MisagoTestCase
 from misago.categories.models import Category
-from misago.core import threadstore
-from misago.core.cache import cache
 
 from misago.threads import testutils
 from misago.threads.utils import add_categories_to_threads
 
 
-class AddCategoriesToThreadsTests(TestCase):
+class AddCategoriesToThreadsTests(MisagoTestCase):
     def setUp(self):
         super(AddCategoriesToThreadsTests, self).setUp()
 
-        cache.clear()
-        threadstore.clear()
-
         self.root = Category.objects.root_category()
 
         """
@@ -72,8 +66,7 @@ class AddCategoriesToThreadsTests(TestCase):
             css_class='showing-category-f',
         ).insert_at(self.category_e, position='last-child', save=True)
 
-        cache.clear()
-        threadstore.clear()
+        self.clear_state()
 
         Category.objects.partial_rebuild(self.root.tree_id)
 

misago/users/tests/test_testutils.py

@@ -1,8 +1,7 @@
 import json
 from django.core.urlresolvers import reverse
-
-from misago.users.testutils import (UserTestCase, AuthenticatedUserTestCase,
-                                    SuperUserTestCase)
+from misago.users.testutils import (
+    UserTestCase, AuthenticatedUserTestCase, SuperUserTestCase)
 
 
 class UserTestCaseTests(UserTestCase):

misago/users/testutils.py

@@ -1,14 +1,19 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+
+from misago.core.testutils import MisagoTestCase
 
 from misago.users.models import AnonymousUser
 
 
-class UserTestCase(TestCase):
+class UserTestCase(MisagoTestCase):
     USER_PASSWORD = "Pass.123"
 
     def setUp(self):
+        super(UserTestCase, self).setUp()
+        self.get_initial_user()
+
+    def get_initial_user(self):
         self.user = self.get_anonymous_user()
 
     def get_anonymous_user(self):
@@ -37,7 +42,7 @@ class UserTestCase(TestCase):
 
 
 class AuthenticatedUserTestCase(UserTestCase):
-    def setUp(self):
+    def get_initial_user(self):
         self.user = self.get_authenticated_user()
         self.login_user(self.user)
 
@@ -47,6 +52,6 @@ class AuthenticatedUserTestCase(UserTestCase):
 
 
 class SuperUserTestCase(AuthenticatedUserTestCase):
-    def setUp(self):
+    def get_initial_user(self):
         self.user = self.get_superuser()
         self.login_user(self.user)