Fixed #26175 -- Removed SHA1 password hashes in tests.

1 files changed, 9 insertions, 18 deletions

diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py
index f651a44ddd..20c542a53b 100644
--- a/tests/admin_docs/tests.py
+++ b/tests/admin_docs/tests.py
@@ -1,4 +1,3 @@
-import datetime
 import sys
 import unittest
 
@@ -18,18 +17,10 @@ class TestDataMixin(object):
 
     @classmethod
     def setUpTestData(cls):
-        # password = "secret"
-        User.objects.create(
-            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',
-            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,
-            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),
-            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
-        )
+        cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
 
 
-@override_settings(
-    PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
-    ROOT_URLCONF='admin_docs.urls')
+@override_settings(ROOT_URLCONF='admin_docs.urls')
 @modify_settings(INSTALLED_APPS={'append': 'django.contrib.admindocs'})
 class AdminDocsTestCase(TestCase):
     pass
@@ -38,8 +29,8 @@ class AdminDocsTestCase(TestCase):
 class MiscTests(AdminDocsTestCase):
 
     def setUp(self):
-        User.objects.create_superuser('super', None, 'secret')
-        self.client.login(username='super', password='secret')
+        superuser = User.objects.create_superuser('super', None, 'secret')
+        self.client.force_login(superuser)
 
     @modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'})
     @override_settings(SITE_ID=None)    # will restore SITE_ID after the test
@@ -57,7 +48,7 @@ class MiscTests(AdminDocsTestCase):
 class AdminDocViewTests(TestDataMixin, AdminDocsTestCase):
 
     def setUp(self):
-        self.client.login(username='super', password='secret')
+        self.client.force_login(self.superuser)
 
     def test_index(self):
         self.client.logout()
@@ -65,7 +56,7 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase):
         # Should display the login screen
         self.assertContains(response,
             '<input type="hidden" name="next" value="/admindocs/" />', html=True)
-        self.client.login(username='super', password='secret')
+        self.client.force_login(self.superuser)
         response = self.client.get(reverse('django-admindocs-docroot'))
         self.assertContains(response, '<h1>Documentation</h1>', html=True)
         self.assertContains(response,
@@ -168,7 +159,7 @@ class XViewMiddlewareTest(TestDataMixin, AdminDocsTestCase):
         user = User.objects.get(username='super')
         response = self.client.head('/xview/func/')
         self.assertNotIn('X-View', response)
-        self.client.login(username='super', password='secret')
+        self.client.force_login(self.superuser)
         response = self.client.head('/xview/func/')
         self.assertIn('X-View', response)
         self.assertEqual(response['X-View'], 'admin_docs.views.xview')
@@ -186,7 +177,7 @@ class XViewMiddlewareTest(TestDataMixin, AdminDocsTestCase):
         user = User.objects.get(username='super')
         response = self.client.head('/xview/class/')
         self.assertNotIn('X-View', response)
-        self.client.login(username='super', password='secret')
+        self.client.force_login(self.superuser)
         response = self.client.head('/xview/class/')
         self.assertIn('X-View', response)
         self.assertEqual(response['X-View'], 'admin_docs.views.XViewClass')
@@ -244,7 +235,7 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase):
     """
 
     def setUp(self):
-        self.client.login(username='super', password='secret')
+        self.client.force_login(self.superuser)
         with captured_stderr() as self.docutils_stderr:
             self.response = self.client.get(reverse('django-admindocs-models-detail', args=['admin_docs', 'Person']))