#414: refactored AdminTestCase

misago/admin/tests/test_admin_views.py

@@ -2,7 +2,7 @@ from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from misago.admin.testutils import admin_login
+from misago.admin.testutils import AdminTestCase
 from misago.admin.views import get_protected_namespace
 
 
@@ -72,13 +72,7 @@ class AdminLoginViewTests(TestCase):
         self.assertEqual(response.status_code, 302)
 
 
-class AdminLogoutTests(TestCase):
-    def setUp(self):
-        User = get_user_model()
-        self.admin = User.objects.create_superuser(
-            'Bob', 'bob@test.com', 'Pass.123')
-        admin_login(self.client, 'Bob', 'Pass.123')
-
+class AdminLogoutTests(AdminTestCase):
     def test_admin_logout(self):
         """admin logout logged from admin only"""
         response = self.client.post(reverse('misago:admin:logout'))
@@ -90,7 +84,7 @@ class AdminLogoutTests(TestCase):
 
         response = self.client.get(reverse('misago:index'))
         self.assertEqual(response.status_code, 200)
-        self.assertIn(self.admin.username, response.content)
+        self.assertIn(self.user.username, response.content)
 
     def test_complete_logout(self):
         """complete logout logged from both admin and site"""
@@ -106,14 +100,10 @@ class AdminLogoutTests(TestCase):
         self.assertIn("Sign in", response.content)
 
 
-class AdminIndexViewTests(TestCase):
+class AdminIndexViewTests(AdminTestCase):
     def test_view_returns_200(self):
         """admin index view returns 200"""
-        User = get_user_model()
-        User.objects.create_superuser('Bob', 'bob@test.com', 'Pass.123')
-        admin_login(self.client, 'Bob', 'Pass.123')
-
         response = self.client.get(reverse('misago:admin:index'))
 
         self.assertEqual(response.status_code, 200)
-        self.assertIn('Bob', response.content)
+        self.assertIn(self.user.username, response.content)

misago/admin/testutils.py

@@ -1,17 +1,16 @@
-from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.test import TestCase
 
+from misago.users.testutils import SuperUserTestCase
 
-def admin_login(client, username, password):
-    client.post(reverse('misago:admin:index'),
-                data={'username': username, 'password': password})
 
-
-class AdminTestCase(TestCase):
+class AdminTestCase(SuperUserTestCase):
     def setUp(self):
-        User = get_user_model()
-        self.test_admin = User.objects.create_superuser('TestAdmin',
-                                                        'admin@test.com',
-                                                        'Pass.123')
-        admin_login(self.client, 'TestAdmin', 'Pass.123')
+        self.user = self.get_superuser()
+        self.login_admin(self.user)
+
+    def login_admin(self, user):
+        self.client.post(reverse('misago:admin:index'), data={
+            'username': user.email,
+            'password': self.USER_PASSWORD
+        })
+        self.client.get(reverse('misago:admin:index'))

misago/users/tests/test_useradmin_views.py

@@ -24,7 +24,7 @@ class UserAdminViewsTests(AdminTestCase):
 
         response = self.client.get(response['location'])
         self.assertEqual(response.status_code, 200)
-        self.assertIn('TestAdmin', response.content)
+        self.assertIn(self.user.username, response.content)
 
     def test_list_search(self):
         """users list is searchable"""