summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-02-05 15:56:52 -0500
committerTim Graham <timograham@gmail.com>2016-02-06 08:47:21 -0500
commit015fad9060a8a6fb273a33b8e8457e504ed26131 (patch)
treedc56db72ffaea2acbe5925a10c95021f7a26df39 /tests
parentf8e865d78f9acb1ad976cffffb207d66ff8cef72 (diff)
downloaddjango-015fad9060a8a6fb273a33b8e8457e504ed26131.tar.gz
Fixed #26175 -- Removed SHA1 password hashes in tests.
Diffstat (limited to 'tests')
-rw-r--r--tests/admin_changelist/tests.py16
-rw-r--r--tests/admin_custom_urls/tests.py15
-rw-r--r--tests/admin_docs/tests.py27
-rw-r--r--tests/admin_inlines/tests.py47
-rw-r--r--tests/admin_utils/test_logentry.py7
-rw-r--r--tests/admin_views/test_adminsite.py14
-rw-r--r--tests/admin_views/tests.py496
-rw-r--r--tests/admin_widgets/tests.py62
-rw-r--r--tests/auth_tests/test_context_processors.py23
-rw-r--r--tests/auth_tests/test_forms.py57
-rw-r--r--tests/auth_tests/test_models.py45
-rw-r--r--tests/auth_tests/test_signals.py25
-rw-r--r--tests/auth_tests/test_templates.py5
-rw-r--r--tests/auth_tests/test_validators.py6
-rw-r--r--tests/auth_tests/test_views.py55
-rw-r--r--tests/flatpages_tests/test_csrf.py4
-rw-r--r--tests/flatpages_tests/test_middleware.py8
-rw-r--r--tests/flatpages_tests/test_views.py4
-rw-r--r--tests/generic_inline_admin/tests.py31
-rw-r--r--tests/proxy_models/tests.py15
-rw-r--r--tests/test_client/tests.py25
-rw-r--r--tests/test_client_regress/tests.py37
-rw-r--r--tests/timezones/tests.py17
-rw-r--r--tests/urlpatterns_reverse/tests.py4
-rw-r--r--tests/view_tests/tests/test_defaults.py7
25 files changed, 220 insertions, 832 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
index 1eb1d160ef..c61954ce5b 100644
--- a/tests/admin_changelist/tests.py
+++ b/tests/admin_changelist/tests.py
@@ -480,9 +480,8 @@ class ChangeListTests(TestCase):
Regression test for #13196: output of functions should be localized
in the changelist.
"""
- User.objects.create_superuser(
- username='super', email='super@localhost', password='secret')
- self.client.login(username='super', password='secret')
+ superuser = User.objects.create_superuser(username='super', email='super@localhost', password='secret')
+ self.client.force_login(superuser)
event = Event.objects.create(date=datetime.date.today())
response = self.client.get(reverse('admin:admin_changelist_event_changelist'))
self.assertContains(response, formats.localize(event.date))
@@ -882,21 +881,14 @@ class AdminLogNodeTestCase(TestCase):
self.assertEqual(t.render(Context({})), 'Added "<User: jondoe>".')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_changelist.urls")
+@override_settings(ROOT_URLCONF='admin_changelist.urls')
class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
available_apps = ['admin_changelist'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
def setUp(self):
- # 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)
- )
+ User.objects.create_superuser(username='super', password='secret', email=None)
def test_add_row_selection(self):
"""
diff --git a/tests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
index 11690e0757..0a78b1afe9 100644
--- a/tests/admin_custom_urls/tests.py
+++ b/tests/admin_custom_urls/tests.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals
-import datetime
-
from django.contrib.admin.utils import quote
from django.contrib.auth.models import User
from django.template.response import TemplateResponse
@@ -11,8 +9,7 @@ from django.urls import reverse
from .models import Action, Car, Person
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_custom_urls.urls',)
+@override_settings(ROOT_URLCONF='admin_custom_urls.urls',)
class AdminCustomUrlsTest(TestCase):
"""
Remember that:
@@ -23,13 +20,7 @@ class AdminCustomUrlsTest(TestCase):
@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')
Action.objects.create(name='delete', description='Remove things.')
Action.objects.create(name='rename', description='Gives things other names.')
Action.objects.create(name='add', description='Add things.')
@@ -44,7 +35,7 @@ class AdminCustomUrlsTest(TestCase):
)
def setUp(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
def test_basic_add_GET(self):
"""
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']))
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index 450ff1ffda..7ea08d1a40 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals
-import datetime
-
from django.contrib.admin import ModelAdmin, TabularInline
from django.contrib.admin.helpers import InlineAdminForm
from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
@@ -26,17 +24,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', email='super@example.com', password='secret')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class TestInline(TestDataMixin, TestCase):
def setUp(self):
@@ -44,8 +35,7 @@ class TestInline(TestDataMixin, TestCase):
holder.save()
Inner(dummy=42, holder=holder).save()
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
self.factory = RequestFactory()
def test_can_delete(self):
@@ -418,13 +408,11 @@ class TestInline(TestDataMixin, TestCase):
self.assertNotContains(response, INLINE_CHANGELINK_HTML)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class TestInlineMedia(TestDataMixin, TestCase):
def setUp(self):
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
def test_inline_media_only_base(self):
holder = Holder(dummy=13)
@@ -452,7 +440,7 @@ class TestInlineMedia(TestDataMixin, TestCase):
self.assertContains(response, 'my_awesome_inline_scripts.js')
-@override_settings(ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class TestInlineAdminForm(TestCase):
def test_immutable_content_type(self):
@@ -471,13 +459,11 @@ class TestInlineAdminForm(TestCase):
self.assertEqual(iaf.original.content_type, parent_ct)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class TestInlineProtectedOnDelete(TestDataMixin, TestCase):
def setUp(self):
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
def test_deleting_inline_with_protected_delete_does_not_validate(self):
lotr = Novel.objects.create(name='Lord of the rings')
@@ -503,7 +489,7 @@ class TestInlineProtectedOnDelete(TestDataMixin, TestCase):
% (chapter, foot_note))
-@override_settings(ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class TestInlinePermissions(TestCase):
"""
Make sure the admin respects permissions for objects that are edited
@@ -546,9 +532,7 @@ class TestInlinePermissions(TestCase):
self.holder_change_url = reverse('admin:admin_inlines_holder2_change', args=(holder.id,))
self.inner2_id = inner2.id
- self.assertEqual(
- self.client.login(username='admin', password='secret'),
- True)
+ self.client.force_login(self.user)
def test_inline_add_m2m_noperm(self):
response = self.client.get(reverse('admin:admin_inlines_author_add'))
@@ -703,21 +687,14 @@ class TestInlinePermissions(TestCase):
self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_inlines.urls")
+@override_settings(ROOT_URLCONF='admin_inlines.urls')
class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
available_apps = ['admin_inlines'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
def setUp(self):
- # 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)
- )
+ User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def test_add_stackeds(self):
"""
diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py
index cf675069fd..1442c8f2c3 100644
--- a/tests/admin_utils/test_logentry.py
+++ b/tests/admin_utils/test_logentry.py
@@ -20,12 +20,7 @@ from .models import Article, ArticleProxy, Site
@override_settings(ROOT_URLCONF="admin_utils.urls")
class LogEntryTests(TestCase):
def setUp(self):
- self.user = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime(2007, 5, 30, 13, 20, 10)
- )
+ self.user = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
self.site = Site.objects.create(domain='example.org')
self.a1 = Article.objects.create(
site=self.site,
diff --git a/tests/admin_views/test_adminsite.py b/tests/admin_views/test_adminsite.py
index 97d11b6939..6fb76ac5fc 100644
--- a/tests/admin_views/test_adminsite.py
+++ b/tests/admin_views/test_adminsite.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals
-import datetime
-
from django.conf.urls import url
from django.contrib import admin
from django.contrib.auth.models import User
@@ -20,10 +18,7 @@ urlpatterns = [
]
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.test_adminsite",
-)
+@override_settings(ROOT_URLCONF='admin_views.test_adminsite')
class SiteEachContextTest(TestCase):
"""
Check each_context contains the documented variables and that available_apps context
@@ -31,12 +26,7 @@ class SiteEachContextTest(TestCase):
"""
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10),
- )
+ cls.u1 = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
factory = RequestFactory()
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 55ff3c5c08..023ace69a9 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -104,19 +104,12 @@ class AdminFieldExtractionMixin(object):
return field
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls",
- USE_I18N=True, USE_L10N=False, LANGUAGE_CODE='en')
+@override_settings(ROOT_URLCONF='admin_views.urls', USE_I18N=True, USE_L10N=False, LANGUAGE_CODE='en')
class AdminViewBasicTestCase(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -995,19 +988,13 @@ class AdminCustomTemplateTests(AdminViewBasicTestCase):
self.assertTemplateUsed(response, 'custom_filter_template.html')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewFormUrlTest(TestCase):
current_app = "admin3"
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -1050,18 +1037,12 @@ class AdminViewFormUrlTest(TestCase):
self.assertContains(response, 'value="overridden_value"')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminJavaScriptTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -1098,18 +1079,12 @@ class AdminJavaScriptTest(TestCase):
self.assertNotContains(response, 'inlines.min.js')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class SaveAsTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.per1 = Person.objects.create(name='John Mauchly', gender=1, alive=True)
def setUp(self):
@@ -1177,7 +1152,7 @@ class SaveAsTests(TestCase):
self.assertTrue(response.context['show_save_as_new'])
-@override_settings(ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class CustomModelAdminTest(AdminViewBasicTestCase):
def test_custom_admin_site_login_form(self):
@@ -1264,49 +1239,18 @@ def get_perm(Model, perm):
return Permission.objects.get(content_type=ct, codename=perm)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewPermissionsTest(TestCase):
"""Tests for Admin Views Permissions."""
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.adduser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='adduser',
- first_name='Add', last_name='User', email='auser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.changeuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser',
- first_name='Change', last_name='User', email='cuser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.deleteuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='deleteuser',
- first_name='Delete', last_name='User', email='duser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.joepublicuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic',
- first_name='Joe', last_name='Public', email='joepublic@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.nostaffuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='nostaff',
- first_name='No', last_name='Staff', email='nostaff@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+ cls.adduser = User.objects.create_user(username='adduser', password='secret', is_staff=True)
+ cls.changeuser = User.objects.create_user(username='changeuser', password='secret', is_staff=True)
+ cls.deleteuser = User.objects.create_user(username='deleteuser', password='secret', is_staff=True)
+ cls.joepublicuser = User.objects.create_user(username='joepublic', password='secret')
+ cls.nostaffuser = User.objects.create_user(username='nostaff', password='secret')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1,
@@ -1542,7 +1486,7 @@ class AdminViewPermissionsTest(TestCase):
self.assertNotContains(response, hint_template.format(''), status_code=200)
# Non-staff user should be shown the hint
- self.client.login(**self.nostaff_login)
+ self.client.force_login(self.nostaffuser)
response = self.client.get(self.index_url, follow=True)
self.assertContains(response, 'login-form')
self.assertContains(response, hint_template.format(self.nostaffuser.username), status_code=200)
@@ -1987,8 +1931,7 @@ class AdminViewPermissionsTest(TestCase):
Post-save message shouldn't contain a link to the change form if the
user doen't have the change permission.
"""
- login = self.client.post(reverse('admin:login'), self.adduser_login)
- self.assertRedirects(login, self.index_url)
+ self.client.force_login(self.adduser)
# Emulate Article creation for user with add-only permission.
post_data = {
"title": "Fun & games",
@@ -2005,23 +1948,15 @@ class AdminViewPermissionsTest(TestCase):
)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewsNoUrlTest(TestCase):
"""Regression test for #17333"""
@classmethod
def setUpTestData(cls):
- cls.changeuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser',
- first_name='Change', last_name='User', email='cuser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
-
- opts = Report._meta
# User who can change Reports
- cls.changeuser.user_permissions.add(get_perm(Report, get_permission_codename('change', opts)))
+ cls.changeuser = User.objects.create_user(username='changeuser', password='secret', is_staff=True)
+ cls.changeuser.user_permissions.add(get_perm(Report, get_permission_codename('change', Report._meta)))
def test_no_standard_modeladmin_urls(self):
"""Admin index views don't break when user's ModelAdmin removes standard urls"""
@@ -2033,24 +1968,13 @@ class AdminViewsNoUrlTest(TestCase):
@skipUnlessDBFeature('can_defer_constraint_checks')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewDeletedObjectsTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.deleteuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='deleteuser',
- first_name='Delete', last_name='User', email='duser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+ cls.deleteuser = User.objects.create_user(username='deleteuser', password='secret', is_staff=True)
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -2115,12 +2039,9 @@ class AdminViewDeletedObjectsTest(TestCase):
def test_perms_needed(self):
self.client.logout()
delete_user = User.objects.get(username='deleteuser')
- delete_user.user_permissions.add(get_perm(Plot,
- get_permission_codename('delete', Plot._meta)))
-
- self.assertTrue(self.client.login(username='deleteuser',
- password='secret'))
+ delete_user.user_permissions.add(get_perm(Plot, get_permission_codename('delete', Plot._meta)))
+ self.client.force_login(self.deleteuser)
response = self.client.get(reverse('admin:admin_views_plot_delete', args=(self.pl1.pk,)))
self.assertContains(response, "your account doesn't have permission to delete the following types of objects")
self.assertContains(response, "<li>plot details</li>")
@@ -2219,18 +2140,12 @@ class AdminViewDeletedObjectsTest(TestCase):
self.assertContains(response, should_contain)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class TestGenericRelations(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.v1 = Villain.objects.create(name='Adam')
cls.pl3 = Plot.objects.create(name='Corn Conspiracy', team_leader=cls.v1, contact=cls.v1)
@@ -2243,18 +2158,12 @@ class TestGenericRelations(TestCase):
self.assertContains(response, "%s</td>" % self.pl3)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewStringPrimaryKeyTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -2400,8 +2309,7 @@ class AdminViewStringPrimaryKeyTest(TestCase):
self.assertIn('/123_2Fhistory/', response['location']) # PK is quoted
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class SecureViewTests(TestCase):
"""
Test behavior of a view protected by the staff_member_required decorator.
@@ -2428,18 +2336,12 @@ class SecureViewTests(TestCase):
self.assertRedirects(response, '%s?myfield=%s' % (reverse('admin:login'), secure_url))
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewUnicodeTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.b1 = Book.objects.create(name='Lærdommer')
cls.p1 = Promo.objects.create(name='<Promo for Lærdommer>', book=cls.b1)
cls.chap1 = Chapter.objects.create(
@@ -2504,18 +2406,12 @@ class AdminViewUnicodeTest(TestCase):
self.assertRedirects(response, reverse('admin:admin_views_book_changelist'))
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewListEditable(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -2937,24 +2833,13 @@ class AdminViewListEditable(TestCase):
self.assertContains(response, '<th class="field-id"><a href="%s">%d</a></th>' % (link2, story2.id), 1)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminSearchTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.joepublicuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic',
- first_name='Joe', last_name='Public', email='joepublic@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+ cls.joepublicuser = User.objects.create_user(username='joepublic', password='secret')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -3061,18 +2946,12 @@ class AdminSearchTest(TestCase):
self.assertTrue(response.context['cl'].show_admin_actions)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminInheritedInlinesTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -3153,18 +3032,12 @@ class AdminInheritedInlinesTest(TestCase):
self.assertEqual(Persona.objects.all()[0].accounts.count(), 2)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminActionsTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = ExternalSubscriber.objects.create(name='John Doe', email='john@example.org')
cls.s2 = Subscriber.objects.create(name='Max Mustermann', email='max@example.org')
@@ -3460,22 +3333,15 @@ action)</option>
)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class TestCustomChangeList(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
def test_custom_changelist(self):
"""
@@ -3493,22 +3359,15 @@ class TestCustomChangeList(TestCase):
self.assertNotContains(response, 'First Gadget')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class TestInlineNotEditable(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
def test_GET_parent_add(self):
"""
@@ -3518,18 +3377,12 @@ class TestInlineNotEditable(TestCase):
self.assertEqual(response.status_code, 200)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminCustomQuerysetTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -3787,18 +3640,12 @@ class AdminCustomQuerysetTest(TestCase):
)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminInlineFileUploadTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -3839,18 +3686,12 @@ class AdminInlineFileUploadTest(TestCase):
self.assertContains(response, b"Currently")
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminInlineTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.post_data = {
@@ -3938,8 +3779,7 @@ class AdminInlineTests(TestCase):
"category_set-2-collector": "1",
}
- result = self.client.login(username='super', password='secret')
- self.assertEqual(result, True)
+ self.client.force_login(self.superuser)
self.collector = Collector(pk=1, name='John Fowles')
self.collector.save()
@@ -4165,18 +4005,12 @@ class AdminInlineTests(TestCase):
self.assertEqual(Category.objects.get(id=4).order, 0)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class NeverCacheTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
def setUp(self):
@@ -4245,18 +4079,12 @@ class NeverCacheTests(TestCase):
self.assertEqual(get_max_age(response), None)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class PrePopulatedTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.p1 = PrePopulatedPost.objects.create(title='A Long Title', published=True, slug='a-long-title')
def setUp(self):
@@ -4288,20 +4116,14 @@ class PrePopulatedTest(TestCase):
self.assertContains(response, "&quot;maxLength&quot;: 1000") # instead of 1,000
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class SeleniumAdminViewsFirefoxTests(AdminSeleniumWebDriverTestCase):
available_apps = ['admin_views'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
def setUp(self):
- self.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ self.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
self.p1 = PrePopulatedPost.objects.create(title='A Long Title', published=True, slug='a-long-title')
def test_prepopulated_fields(self):
@@ -4629,18 +4451,12 @@ class SeleniumAdminViewsIETests(SeleniumAdminViewsFirefoxTests):
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class ReadonlyTest(AdminFieldExtractionMixin, TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -4805,18 +4621,12 @@ class ReadonlyTest(AdminFieldExtractionMixin, TestCase):
self.assertContains(response, "&lt;a&gt;evil&lt;/a&gt;", status_code=200)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class LimitChoicesToInAdminTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -4837,18 +4647,12 @@ class LimitChoicesToInAdminTest(TestCase):
self.assertNotContains(response, marley.username)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class RawIdFieldsTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -4932,8 +4736,7 @@ class RawIdFieldsTest(TestCase):
self.assertContains(response, 'list-display-sketch')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class UserAdminTest(TestCase):
"""
Tests user CRUD functionality.
@@ -4941,24 +4744,9 @@ class UserAdminTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.adduser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='adduser',
- first_name='Add', last_name='User', email='auser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.changeuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser',
- first_name='Change', last_name='User', email='cuser@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+ cls.adduser = User.objects.create_user(username='adduser', password='secret', is_staff=True)
+ cls.changeuser = User.objects.create_user(username='changeuser', password='secret', is_staff=True)
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -5104,8 +4892,7 @@ class UserAdminTest(TestCase):
self.assertEqual(response.context['form_url'], 'pony')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class GroupAdminTest(TestCase):
"""
Tests group CRUD functionality.
@@ -5113,12 +4900,7 @@ class GroupAdminTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5144,18 +4926,12 @@ class GroupAdminTest(TestCase):
self.assertEqual(response.status_code, 200)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class CSSTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = Section.objects.create(name='Test section')
cls.a1 = Article.objects.create(
content='<p>Middle content</p>', date=datetime.datetime(2008, 3, 18, 11, 54, 58), section=cls.s1
@@ -5281,19 +5057,13 @@ except ImportError:
@unittest.skipUnless(docutils, "no docutils installed.")
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
@modify_settings(INSTALLED_APPS={'append': ['django.contrib.admindocs', 'django.contrib.flatpages']})
class AdminDocsTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5331,8 +5101,7 @@ class AdminDocsTest(TestCase):
@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls",
+ ROOT_URLCONF='admin_views.urls',
TEMPLATES=[{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
@@ -5351,12 +5120,7 @@ class ValidXHTMLTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5367,19 +5131,12 @@ class ValidXHTMLTests(TestCase):
self.assertNotContains(response, ' xml:lang=""')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls",
- USE_THOUSAND_SEPARATOR=True, USE_L10N=True)
+@override_settings(ROOT_URLCONF='admin_views.urls', USE_THOUSAND_SEPARATOR=True, USE_L10N=True)
class DateHierarchyTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5498,8 +5255,7 @@ class DateHierarchyTests(TestCase):
self.assert_non_localized_year(response, 2005)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminCustomSaveRelatedTests(TestCase):
"""
Ensure that one can easily customize the way related objects are saved.
@@ -5508,12 +5264,7 @@ class AdminCustomSaveRelatedTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5575,18 +5326,12 @@ class AdminCustomSaveRelatedTests(TestCase):
self.assertEqual(['Catherine Stone', 'Paul Stone'], children_names)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewLogoutTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def test_logout(self):
self.client.force_login(self.superuser)
@@ -5609,18 +5354,12 @@ class AdminViewLogoutTests(TestCase):
self.assertContains(response, '<input type="hidden" name="next" value="%s" />' % reverse('admin:index'))
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminUserMessageTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5672,25 +5411,14 @@ class AdminUserMessageTest(TestCase):
html=True)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminKeepChangeListFiltersTests(TestCase):
admin_site = site
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.joepublicuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic',
- first_name='Joe', last_name='Public', email='joepublic@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+ cls.joepublicuser = User.objects.create_user(username='joepublic', password='secret')
def setUp(self):
self.client.force_login(self.superuser)
@@ -5976,19 +5704,13 @@ class NamespacedAdminKeepChangeListFiltersTests(AdminKeepChangeListFiltersTests)
admin_site = site2
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class TestLabelVisibility(TestCase):
""" #11277 -Labels of hidden fields in admin were not hidden. """
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
@@ -6024,18 +5746,12 @@ class TestLabelVisibility(TestCase):
self.assertContains(response, '<div class="form-row hidden')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class AdminViewOnSiteTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = State.objects.create(name='New York')
cls.s2 = State.objects.create(name='Illinois')
@@ -6161,18 +5877,12 @@ class AdminViewOnSiteTests(TestCase):
self.assertIsNone(model_admin.get_view_on_site_url(Worker()))
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class InlineAdminViewOnSiteTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
cls.s1 = State.objects.create(name='New York')
cls.s2 = State.objects.create(name='Illinois')
@@ -6211,7 +5921,7 @@ class InlineAdminViewOnSiteTest(TestCase):
self.assertContains(response, '"/worker_inline/%s/%s/"' % (self.w1.surname, self.w1.name))
-@override_settings(ROOT_URLCONF="admin_views.urls")
+@override_settings(ROOT_URLCONF='admin_views.urls')
class TestEtagWithAdminView(SimpleTestCase):
# See https://code.djangoproject.com/ticket/16003
@@ -6227,10 +5937,7 @@ class TestEtagWithAdminView(SimpleTestCase):
self.assertTrue(response.has_header('ETag'))
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="admin_views.urls",
-)
+@override_settings(ROOT_URLCONF='admin_views.urls')
class GetFormsetsWithInlinesArgumentTest(TestCase):
"""
#23934 - When adding a new model instance in the admin, the 'obj' argument
@@ -6242,12 +5949,7 @@ class GetFormsetsWithInlinesArgumentTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.superuser = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
def setUp(self):
self.client.force_login(self.superuser)
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index de27f0163b..4d47179c37 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -33,30 +33,15 @@ class TestDataMixin(object):
@classmethod
def setUpTestData(cls):
- cls.u1 = 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(2007, 5, 30, 13, 20, 10),
- date_joined=datetime(2007, 5, 30, 13, 20, 10)
- )
- cls.u2 = User.objects.create(
- pk=101, username='testser', first_name='Add', last_name='User', email='auser@example.com',
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=False,
- is_staff=True, last_login=datetime(2007, 5, 30, 13, 20, 10),
- date_joined=datetime(2007, 5, 30, 13, 20, 10)
- )
- models.Car.objects.create(id=1, owner=cls.u1, make='Volkswagen', model='Passat')
- models.Car.objects.create(id=2, owner=cls.u2, make='BMW', model='M3')
+ cls.superuser = User.objects.create_superuser(username='super', password='secret', email=None)
+ cls.u2 = User.objects.create_user(username='testser', password='secret')
+ models.Car.objects.create(owner=cls.superuser, make='Volkswagen', model='Passat')
+ models.Car.objects.create(owner=cls.u2, make='BMW', model='M3')
class SeleniumDataMixin(object):
def setUp(self):
- self.u1 = 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(2007, 5, 30, 13, 20, 10),
- date_joined=datetime(2007, 5, 30, 13, 20, 10)
- )
+ self.u1 = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
class AdminFormfieldForDBFieldTests(SimpleTestCase):
@@ -195,38 +180,35 @@ class AdminFormfieldForDBFieldTests(SimpleTestCase):
)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class AdminFormfieldForDBFieldWithRequestTests(TestDataMixin, TestCase):
def test_filter_choices_by_request_user(self):
"""
Ensure the user can only see their own cars in the foreign key dropdown.
"""
- self.client.login(username="super", password="secret")
+ self.client.force_login(self.superuser)
response = self.client.get(reverse('admin:admin_widgets_cartire_add'))
self.assertNotContains(response, "BMW M3")
self.assertContains(response, "Volkswagen Passat")
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class AdminForeignKeyWidgetChangeList(TestDataMixin, TestCase):
def setUp(self):
- self.client.login(username="super", password="secret")
+ self.client.force_login(self.superuser)
def test_changelist_ForeignKey(self):
response = self.client.get(reverse('admin:admin_widgets_car_changelist'))
self.assertContains(response, '/auth/user/add/')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class AdminForeignKeyRawIdWidget(TestDataMixin, TestCase):
def setUp(self):
- self.client.login(username="super", password="secret")
+ self.client.force_login(self.superuser)
def test_nonexistent_target_id(self):
band = models.Band.objects.create(name='Bogey Blues')
@@ -407,10 +389,7 @@ class AdminURLWidgetTest(SimpleTestCase):
)
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls',
-)
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class AdminFileWidgetTests(TestDataMixin, TestCase):
@classmethod
@@ -443,7 +422,7 @@ class AdminFileWidgetTests(TestDataMixin, TestCase):
"""
File widgets should render as a link when they're marked "read only."
"""
- self.client.login(username="super", password="secret")
+ self.client.force_login(self.superuser)
response = self.client.get(reverse('admin:admin_widgets_album_change', args=(self.album.id,)))
self.assertContains(
response,
@@ -639,8 +618,7 @@ class RelatedFieldWidgetWrapperTests(SimpleTestCase):
self.assertFalse(wrapper.can_delete_related)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class DateTimePickerSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps
@@ -818,8 +796,7 @@ class DateTimePickerSeleniumIETests(DateTimePickerSeleniumFirefoxTests):
@skipIf(pytz is None, "this test requires pytz")
@override_settings(TIME_ZONE='Asia/Singapore')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class DateTimePickerShortcutsSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
@@ -900,8 +877,7 @@ class DateTimePickerAltTimezoneSeleniumIETests(DateTimePickerAltTimezoneSelenium
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class HorizontalVerticalFilterSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps
@@ -1201,8 +1177,7 @@ class HorizontalVerticalFilterSeleniumIETests(HorizontalVerticalFilterSeleniumFi
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class AdminRawIdWidgetSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
@@ -1297,8 +1272,7 @@ class AdminRawIdWidgetSeleniumIETests(AdminRawIdWidgetSeleniumFirefoxTests):
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='admin_widgets.urls')
+@override_settings(ROOT_URLCONF='admin_widgets.urls')
class RelatedFieldWidgetSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
diff --git a/tests/auth_tests/test_context_processors.py b/tests/auth_tests/test_context_processors.py
index 10f4d81612..3a8d800c74 100644
--- a/tests/auth_tests/test_context_processors.py
+++ b/tests/auth_tests/test_context_processors.py
@@ -1,5 +1,3 @@
-import datetime
-
from django.contrib.auth import authenticate
from django.contrib.auth.context_processors import PermLookupDict, PermWrapper
from django.contrib.auth.models import Permission, User
@@ -59,12 +57,7 @@ class PermWrapperTests(SimpleTestCase):
self.EQLimiterObject() in pldict
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='auth_tests.urls',
- TEMPLATES=AUTH_TEMPLATES,
- USE_TZ=False, # required for loading the fixture
-)
+@override_settings(ROOT_URLCONF='auth_tests.urls', TEMPLATES=AUTH_TEMPLATES)
class AuthContextProcessorTests(TestCase):
"""
Tests for the ``django.contrib.auth.context_processors.auth`` processor
@@ -72,13 +65,7 @@ class AuthContextProcessorTests(TestCase):
@classmethod
def setUpTestData(cls):
- # password = "secret"
- cls.u1 = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com',
- is_staff=True, is_active=True, 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(MIDDLEWARE_CLASSES=AUTH_MIDDLEWARE_CLASSES)
def test_session_not_accessed(self):
@@ -104,7 +91,7 @@ class AuthContextProcessorTests(TestCase):
Permission.objects.get(
content_type=ContentType.objects.get_for_model(Permission),
codename='add_permission'))
- self.client.login(username='normal', password='secret')
+ self.client.force_login(u)
response = self.client.get('/auth_processor_perms/')
self.assertContains(response, "Has auth permissions")
self.assertContains(response, "Has auth.add_permission permissions")
@@ -123,7 +110,7 @@ class AuthContextProcessorTests(TestCase):
self.assertNotContains(response, "nonexisting")
def test_message_attrs(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
response = self.client.get('/auth_processor_messages/')
self.assertContains(response, "Message 1")
@@ -138,7 +125,7 @@ class AuthContextProcessorTests(TestCase):
user = authenticate(username='super', password='secret')
response = self.client.get('/auth_processor_user/')
self.assertContains(response, "unicode: super")
- self.assertContains(response, "id: %d" % self.u1.pk)
+ self.assertContains(response, "id: %d" % self.superuser.pk)
self.assertContains(response, "username: super")
# bug #12037 is tested by the {% url %} in the template:
self.assertContains(response, "url: /userpage/super/")
diff --git a/tests/auth_tests/test_forms.py b/tests/auth_tests/test_forms.py
index 79f0f65628..1885326cf9 100644
--- a/tests/auth_tests/test_forms.py
+++ b/tests/auth_tests/test_forms.py
@@ -1,6 +1,5 @@
from __future__ import unicode_literals
-import datetime
import re
from django import forms
@@ -27,44 +26,14 @@ class TestDataMixin(object):
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u2 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='inactive',
- first_name='Inactive', last_name='User', email='testclient2@example.com', is_staff=False, is_active=False,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='staffmember@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u4 = User.objects.create(
- password='', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='empty_password', first_name='Empty', last_name='Password', email='empty_password@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u5 = User.objects.create(
- password='$', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unmanageable_password', first_name='Unmanageable', last_name='Password',
- email='unmanageable_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u6 = User.objects.create(
- password='foo$bar', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unknown_password', first_name='Unknown', last_name='Password',
- email='unknown_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
+ cls.u1 = User.objects.create_user(username='testclient', password='password', email='testclient@example.com')
+ cls.u2 = User.objects.create_user(username='inactive', password='password', is_active=False)
+ cls.u3 = User.objects.create_user(username='staff', password='password')
+ cls.u4 = User.objects.create(username='empty_password', password='')
+ cls.u5 = User.objects.create(username='unmanageable_password', password='$')
+ cls.u6 = User.objects.create(username='unknown_password', password='foo$bar')
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class UserCreationFormTest(TestDataMixin, TestCase):
def test_user_already_exists(self):
@@ -154,7 +123,6 @@ class UserCreationFormTest(TestDataMixin, TestCase):
)
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class AuthenticationFormTest(TestDataMixin, TestCase):
def test_invalid_username(self):
@@ -264,7 +232,6 @@ class AuthenticationFormTest(TestDataMixin, TestCase):
self.assertEqual(form.fields['username'].label, "")
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class SetPasswordFormTest(TestDataMixin, TestCase):
def test_password_verification(self):
@@ -315,7 +282,6 @@ class SetPasswordFormTest(TestDataMixin, TestCase):
)
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class PasswordChangeFormTest(TestDataMixin, TestCase):
def test_incorrect_password(self):
@@ -366,7 +332,6 @@ class PasswordChangeFormTest(TestDataMixin, TestCase):
['old_password', 'new_password1', 'new_password2'])
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class UserChangeFormTest(TestDataMixin, TestCase):
def test_username_validity(self):
@@ -431,7 +396,8 @@ class UserChangeFormTest(TestDataMixin, TestCase):
form = UserChangeForm(instance=user, data=post_data)
self.assertTrue(form.is_valid())
- self.assertEqual(form.cleaned_data['password'], 'sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161')
+ # original hashed password contains $
+ self.assertIn('$', form.cleaned_data['password'])
def test_bug_19349_bound_password_field(self):
user = User.objects.get(username='testclient')
@@ -442,11 +408,7 @@ class UserChangeFormTest(TestDataMixin, TestCase):
self.assertEqual(form.initial['password'], form['password'].value())
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- TEMPLATES=AUTH_TEMPLATES,
- USE_TZ=False,
-)
+@override_settings(TEMPLATES=AUTH_TEMPLATES)
class PasswordResetFormTest(TestDataMixin, TestCase):
@classmethod
@@ -623,7 +585,6 @@ class ReadOnlyPasswordHashTest(SimpleTestCase):
self.assertFalse(field.has_changed('aaa', 'bbb'))
-@override_settings(USE_TZ=False, PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'])
class AdminPasswordChangeFormTest(TestDataMixin, TestCase):
@mock.patch('django.contrib.auth.password_validation.password_changed')
diff --git a/tests/auth_tests/test_models.py b/tests/auth_tests/test_models.py
index e5b00f5f29..8f8f3ff900 100644
--- a/tests/auth_tests/test_models.py
+++ b/tests/auth_tests/test_models.py
@@ -1,5 +1,3 @@
-import datetime
-
from django.conf.global_settings import PASSWORD_HASHERS
from django.contrib.auth import get_user_model
from django.contrib.auth.hashers import get_hasher
@@ -12,49 +10,10 @@ from django.db.models.signals import post_save
from django.test import TestCase, mock, override_settings
-@override_settings(USE_TZ=False)
class NaturalKeysTestCase(TestCase):
- @classmethod
- def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u2 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='inactive',
- first_name='Inactive', last_name='User', email='testclient2@example.com', is_staff=False, is_active=False,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='staffmember@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u4 = User.objects.create(
- password='', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='empty_password', first_name='Empty', last_name='Password', email='empty_password@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u5 = User.objects.create(
- password='$', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unmanageable_password', first_name='Unmanageable', last_name='Password',
- email='unmanageable_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u6 = User.objects.create(
- password='foo$bar', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unknown_password', first_name='Unknown', last_name='Password',
- email='unknown_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
-
def test_user_natural_key(self):
- staff_user = User.objects.get(username='staff')
+ staff_user = User.objects.create_user(username='staff')
self.assertEqual(User.objects.get_by_natural_key('staff'), staff_user)
self.assertEqual(staff_user.natural_key(), ('staff',))
@@ -63,7 +22,6 @@ class NaturalKeysTestCase(TestCase):
self.assertEqual(Group.objects.get_by_natural_key('users'), users_group)
-@override_settings(USE_TZ=False)
class LoadDataWithoutNaturalKeysTestCase(TestCase):
fixtures = ['regular.json']
@@ -73,7 +31,6 @@ class LoadDataWithoutNaturalKeysTestCase(TestCase):
self.assertEqual(group, user.groups.get())
-@override_settings(USE_TZ=False)
class LoadDataWithNaturalKeysTestCase(TestCase):
fixtures = ['natural.json']
diff --git a/tests/auth_tests/test_signals.py b/tests/auth_tests/test_signals.py
index e81c202211..b559fb53ce 100644
--- a/tests/auth_tests/test_signals.py
+++ b/tests/auth_tests/test_signals.py
@@ -1,30 +1,16 @@
-import datetime
-
from django.contrib.auth import signals
from django.contrib.auth.models import User
from django.test import TestCase, override_settings
from django.test.client import RequestFactory
-@override_settings(USE_TZ=False,
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='auth_tests.urls')
+@override_settings(ROOT_URLCONF='auth_tests.urls')
class SignalTestCase(TestCase):
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='staffmember@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
+ cls.u1 = User.objects.create_user(username='testclient', password='password')
+ cls.u3 = User.objects.create_user(username='staff', password='password')
def listener_login(self, user, **kwargs):
self.logged_in.append(user)
@@ -87,8 +73,7 @@ class SignalTestCase(TestCase):
user.username = "This username shouldn't get saved"
request = RequestFactory().get('/login')
- signals.user_logged_in.send(sender=user.__class__, request=request,
- user=user)
- user = User.objects.get(pk=self.u3.pk)
+ signals.user_logged_in.send(sender=user.__class__, request=request, user=user)
+ user.refresh_from_db()
self.assertEqual(user.username, 'staff')
self.assertNotEqual(user.last_login, old_last_login)
diff --git a/tests/auth_tests/test_templates.py b/tests/auth_tests/test_templates.py
index 75c4e8b784..781ffcb735 100644
--- a/tests/auth_tests/test_templates.py
+++ b/tests/auth_tests/test_templates.py
@@ -10,10 +10,7 @@ from django.utils.encoding import force_bytes, force_text
from django.utils.http import urlsafe_base64_encode
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='auth_tests.urls',
-)
+@override_settings(ROOT_URLCONF='auth_tests.urls')
class AuthTemplateTests(TestCase):
def test_titles(self):
diff --git a/tests/auth_tests/test_validators.py b/tests/auth_tests/test_validators.py
index a9f47eac1f..5d758cd342 100644
--- a/tests/auth_tests/test_validators.py
+++ b/tests/auth_tests/test_validators.py
@@ -97,9 +97,9 @@ class MinimumLengthValidatorTest(TestCase):
class UserAttributeSimilarityValidatorTest(TestCase):
def test_validate(self):
- user = User.objects.create(
- username='testclient', first_name='Test', last_name='Client', email='testclient@example.com',
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
+ user = User.objects.create_user(
+ username='testclient', password='password', email='testclient@example.com',
+ first_name='Test', last_name='Client',
)
expected_error = "The password is too similar to the %s."
diff --git a/tests/auth_tests/test_views.py b/tests/auth_tests/test_views.py
index 336e9a1482..7fd493ca34 100644
--- a/tests/auth_tests/test_views.py
+++ b/tests/auth_tests/test_views.py
@@ -35,13 +35,9 @@ from .settings import AUTH_TEMPLATES
@override_settings(
- LANGUAGES=[
- ('en', 'English'),
- ],
+ LANGUAGES=[('en', 'English')],
LANGUAGE_CODE='en',
TEMPLATES=AUTH_TEMPLATES,
- USE_TZ=False,
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF='auth_tests.urls',
)
class AuthViewsTestCase(TestCase):
@@ -51,41 +47,8 @@ class AuthViewsTestCase(TestCase):
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u2 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='inactive',
- first_name='Inactive', last_name='User', email='testclient2@example.com', is_staff=False, is_active=False,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='staffmember@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u4 = User.objects.create(
- password='', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='empty_password', first_name='Empty', last_name='Password', email='empty_password@example.com',
- is_staff=False, is_active=True, date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u5 = User.objects.create(
- password='$', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unmanageable_password', first_name='Unmanageable', last_name='Password',
- email='unmanageable_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u6 = User.objects.create(
- password='foo$bar', last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False,
- username='unknown_password', first_name='Unknown', last_name='Password',
- email='unknown_password@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
+ cls.u1 = User.objects.create_user(username='testclient', password='password', email='testclient@example.com')
+ cls.u3 = User.objects.create_user(username='staff', password='password', email='staffmember@example.com')
def login(self, username='testclient', password='password'):
response = self.client.post('/login/', {
@@ -373,10 +336,11 @@ class CustomUserPasswordResetTest(AuthViewsTestCase):
@classmethod
def setUpTestData(cls):
cls.u1 = CustomUser.custom_objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), email='staffmember@example.com', is_active=True,
- is_admin=False, date_of_birth=datetime.date(1976, 11, 8)
+ email='staffmember@example.com',
+ date_of_birth=datetime.date(1976, 11, 8),
)
+ cls.u1.set_password('password')
+ cls.u1.save()
def _test_confirm_start(self):
# Start by creating the email
@@ -892,10 +856,7 @@ class LogoutTest(AuthViewsTestCase):
# Redirect in test_user_change_password will fail if session auth hash
# isn't updated after password change (#21649)
-@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='auth_tests.urls_admin',
-)
+@override_settings(ROOT_URLCONF='auth_tests.urls_admin')
class ChangelistTests(AuthViewsTestCase):
def setUp(self):
diff --git a/tests/flatpages_tests/test_csrf.py b/tests/flatpages_tests/test_csrf.py
index 20349f571f..0ffc567c48 100644
--- a/tests/flatpages_tests/test_csrf.py
+++ b/tests/flatpages_tests/test_csrf.py
@@ -68,8 +68,8 @@ class FlatpageCSRFTests(TestCase):
"A flatpage served through a view can require authentication"
response = self.client.get('/flatpage_root/sekrit/')
self.assertRedirects(response, '/accounts/login/?next=/flatpage_root/sekrit/')
- User.objects.create_user('testuser', 'test@example.com', 's3krit')
- self.client.login(username='testuser', password='s3krit')
+ user = User.objects.create_user('testuser', 'test@example.com', 's3krit')
+ self.client.force_login(user)
response = self.client.get('/flatpage_root/sekrit/')
self.assertContains(response, "<p>Isn't it sekrit!</p>")
diff --git a/tests/flatpages_tests/test_middleware.py b/tests/flatpages_tests/test_middleware.py
index fd9bd11a5b..37e789d1b1 100644
--- a/tests/flatpages_tests/test_middleware.py
+++ b/tests/flatpages_tests/test_middleware.py
@@ -68,8 +68,8 @@ class FlatpageMiddlewareTests(TestDataMixin, TestCase):
"A flatpage served through a view can require authentication"
response = self.client.get('/flatpage_root/sekrit/')
self.assertRedirects(response, '/accounts/login/?next=/flatpage_root/sekrit/')
- User.objects.create_user('testuser', 'test@example.com', 's3krit')
- self.client.login(username='testuser', password='s3krit')
+ user = User.objects.create_user('testuser', 'test@example.com', 's3krit')
+ self.client.force_login(user)
response = self.client.get('/flatpage_root/sekrit/')
self.assertContains(response, "<p>Isn't it sekrit!</p>")
@@ -87,8 +87,8 @@ class FlatpageMiddlewareTests(TestDataMixin, TestCase):
"A flatpage served by the middleware can require authentication"
response = self.client.get('/sekrit/')
self.assertRedirects(response, '/accounts/login/?next=/sekrit/')
- User.objects.create_user('testuser', 'test@example.com', 's3krit')
- self.client.login(username='testuser', password='s3krit')
+ user = User.objects.create_user('testuser', 'test@example.com', 's3krit')
+ self.client.force_login(user)
response = self.client.get('/sekrit/')
self.assertContains(response, "<p>Isn't it sekrit!</p>")
diff --git a/tests/flatpages_tests/test_views.py b/tests/flatpages_tests/test_views.py
index 58dd2eb81e..1a93a543b7 100644
--- a/tests/flatpages_tests/test_views.py
+++ b/tests/flatpages_tests/test_views.py
@@ -68,8 +68,8 @@ class FlatpageViewTests(TestDataMixin, TestCase):
"A flatpage served through a view can require authentication"
response = self.client.get('/flatpage_root/sekrit/')
self.assertRedirects(response, '/accounts/login/?next=/flatpage_root/sekrit/')
- User.objects.create_user('testuser', 'test@example.com', 's3krit')
- self.client.login(username='testuser', password='s3krit')
+ user = User.objects.create_user('testuser', 'test@example.com', 's3krit')
+ self.client.force_login(user)
response = self.client.get('/flatpage_root/sekrit/')
self.assertContains(response, "<p>Isn't it sekrit!</p>")
diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py
index b2b8846063..4bf352ebac 100644
--- a/tests/generic_inline_admin/tests.py
+++ b/tests/generic_inline_admin/tests.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-import datetime
-
from django.contrib import admin
from django.contrib.admin.sites import AdminSite
from django.contrib.auth.models import User
@@ -24,30 +22,17 @@ 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')
# Set DEBUG to True to ensure {% include %} will raise exceptions.
# That is how inlines are rendered and #9498 will bubble up if it is an issue.
-@override_settings(
- DEBUG=True,
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="generic_inline_admin.urls",
-)
+@override_settings(DEBUG=True, ROOT_URLCONF='generic_inline_admin.urls')
class GenericAdminViewTest(TestDataMixin, TestCase):
def setUp(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
- # Can't load content via a fixture (since the GenericForeignKey
- # relies on content type IDs, which will vary depending on what
- # other tests have been run), thus we do it here.
e = Episode.objects.create(name='This Week in Django')
self.episode_pk = e.pk
m = Media(content_object=e, url='http://example.com/podcast.mp3')
@@ -215,12 +200,11 @@ class GenericAdminViewTest(TestDataMixin, TestCase):
self.assertTrue(formset.get_queryset().ordered)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="generic_inline_admin.urls")
+@override_settings(ROOT_URLCONF='generic_inline_admin.urls')
class GenericInlineAdminParametersTest(TestDataMixin, TestCase):
def setUp(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
self.factory = RequestFactory()
def _create_object(self, model):
@@ -361,12 +345,11 @@ class GenericInlineAdminParametersTest(TestDataMixin, TestCase):
self.assertEqual(formset.max_num, 2)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF="generic_inline_admin.urls")
+@override_settings(ROOT_URLCONF='generic_inline_admin.urls')
class GenericInlineAdminWithUniqueTogetherTest(TestDataMixin, TestCase):
def setUp(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
def test_add(self):
category_id = Category.objects.create(name='male').pk
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 3527c5bc06..7987ea480e 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals
-import datetime
-
from django.contrib import admin
from django.contrib.auth.models import User as AuthUser
from django.contrib.contenttypes.models import ContentType
@@ -382,18 +380,12 @@ class ProxyModelTests(TestCase):
self.assertEqual(MyPerson(id=100), Person(id=100))
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='proxy_models.urls',)
+@override_settings(ROOT_URLCONF='proxy_models.urls')
class ProxyModelAdminTests(TestCase):
@classmethod
def setUpTestData(cls):
- cls.u1 = AuthUser.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
- last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super',
- first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
- )
+ cls.superuser = AuthUser.objects.create(is_superuser=True, is_staff=True)
cls.tu1 = ProxyTrackerUser.objects.create(name='Django Pony', status='emperor')
cls.i1 = Issue.objects.create(summary="Pony's Issue", assignee=cls.tu1)
@@ -427,11 +419,10 @@ class ProxyModelAdminTests(TestCase):
reverse('admin_proxy:proxy_models_proxytrackeruser_change', args=(proxy.pk,)), proxy
)
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.superuser)
response = self.client.get(reverse('admin_proxy:proxy_models_trackeruser_delete', args=(user.pk,)))
delete_str = response.context['deleted_objects'][0]
self.assertEqual(delete_str, user_str)
response = self.client.get(reverse('admin_proxy:proxy_models_proxytrackeruser_delete', args=(proxy.pk,)))
delete_str = response.context['deleted_objects'][0]
self.assertEqual(delete_str, proxy_str)
- self.client.logout()
diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py
index 911bcebd3b..741dd0be54 100644
--- a/tests/test_client/tests.py
+++ b/tests/test_client/tests.py
@@ -22,8 +22,6 @@ rather than the HTML rendered to the end-user.
"""
from __future__ import unicode_literals
-import datetime
-
from django.contrib.auth.models import User
from django.core import mail
from django.http import HttpResponse
@@ -35,30 +33,13 @@ from django.urls import reverse_lazy
from .views import get_view, post_view, trace_view
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client.urls',)
+@override_settings(ROOT_URLCONF='test_client.urls')
class ClientTest(TestCase):
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u2 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='inactive',
- first_name='Inactive', last_name='User', email='testclient@example.com', is_staff=False, is_active=False,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='testclient@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
+ cls.u1 = User.objects.create_user(username='testclient', password='password')
+ cls.u2 = User.objects.create_user(username='inactive', password='password', is_active=False)
def test_get_view(self):
"GET a view"
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
index bb078a1ff8..d7f33d90f7 100644
--- a/tests/test_client_regress/tests.py
+++ b/tests/test_client_regress/tests.py
@@ -4,7 +4,6 @@ Regression tests for the Test Client, especially the customized assertions.
"""
from __future__ import unicode_literals
-import datetime
import itertools
import os
@@ -33,24 +32,8 @@ class TestDataMixin(object):
@classmethod
def setUpTestData(cls):
- cls.u1 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u2 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='inactive',
- first_name='Inactive', last_name='User', email='testclient@example.com', is_staff=False, is_active=False,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
- cls.u3 = User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='staff',
- first_name='Staff', last_name='Member', email='testclient@example.com', is_staff=True, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
+ cls.u1 = User.objects.create_user(username='testclient', password='password')
+ cls.staff = User.objects.create_user(username='staff', password='password', is_staff=True)
@override_settings(ROOT_URLCONF='test_client_regress.urls')
@@ -217,8 +200,7 @@ class AssertContainsTests(SimpleTestCase):
self.assertNotContains(response, 'Bye')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client_regress.urls',)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class AssertTemplateUsedTests(TestDataMixin, TestCase):
def test_no_context(self):
@@ -881,8 +863,7 @@ class AssertFormsetErrorTests(SimpleTestCase):
**kwargs)
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client_regress.urls',)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class LoginTests(TestDataMixin, TestCase):
def test_login_different_client(self):
@@ -903,7 +884,6 @@ class LoginTests(TestDataMixin, TestCase):
@override_settings(
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
SESSION_ENGINE='test_client_regress.session',
ROOT_URLCONF='test_client_regress.urls',
)
@@ -948,8 +928,7 @@ class URLEscapingTests(SimpleTestCase):
self.assertEqual(response.content, b'Hi, Arthur')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client_regress.urls',)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class ExceptionTests(TestDataMixin, TestCase):
def test_exception_cleared(self):
@@ -1016,8 +995,7 @@ class zzUrlconfSubstitutionTests(SimpleTestCase):
reverse('arg_view', args=['somename'])
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client_regress.urls',)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class ContextTests(TestDataMixin, TestCase):
def test_single_context(self):
@@ -1089,8 +1067,7 @@ class ContextTests(TestDataMixin, TestCase):
self.assertEqual(response.context['nested'], 'yes')
-@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='test_client_regress.urls',)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class SessionTests(TestDataMixin, TestCase):
def test_session(self):
diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py
index 97af0e729d..e803927d36 100644
--- a/tests/timezones/tests.py
+++ b/tests/timezones/tests.py
@@ -1200,16 +1200,19 @@ class NewFormsTests(TestCase):
self.assertIn("2011-09-01 17:20:30", str(form))
-@override_settings(DATETIME_FORMAT='c', TIME_ZONE='Africa/Nairobi', USE_L10N=False, USE_TZ=True,
- PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
- ROOT_URLCONF='timezones.urls')
+@override_settings(
+ DATETIME_FORMAT='c',
+ TIME_ZONE='Africa/Nairobi',
+ USE_L10N=False,
+ USE_TZ=True,
+ ROOT_URLCONF='timezones.urls',
+)
class AdminTests(TestCase):
@classmethod
def setUpTestData(cls):
- # password = "secret"
- cls.u1 = User.objects.create(
- password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',
+ cls.u1 = User.objects.create_user(
+ password='secret',
last_login=datetime.datetime(2007, 5, 30, 13, 20, 10, tzinfo=UTC),
is_superuser=True, username='super', first_name='Super', last_name='User',
email='super@example.com', is_staff=True, is_active=True,
@@ -1217,7 +1220,7 @@ class AdminTests(TestCase):
)
def setUp(self):
- self.client.login(username='super', password='secret')
+ self.client.force_login(self.u1)
@requires_tz_support
def test_changelist(self):
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 5c695df9f5..4c60ecd7c6 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -437,10 +437,10 @@ class ReverseLazyTest(TestCase):
self.assertRedirects(response, "/redirected_to/", status_code=302)
def test_user_permission_with_lazy_reverse(self):
- User.objects.create_user('alfred', 'alfred@example.com', password='testpw')
+ alfred = User.objects.create_user('alfred', 'alfred@example.com', password='testpw')
response = self.client.get('/login_required_view/')
self.assertRedirects(response, "/login/?next=/login_required_view/", status_code=302)
- self.client.login(username='alfred', password='testpw')
+ self.client.force_login(alfred)
response = self.client.get('/login_required_view/')
self.assertEqual(response.status_code, 200)
diff --git a/tests/view_tests/tests/test_defaults.py b/tests/view_tests/tests/test_defaults.py
index 1ef8bbaf74..135b8d2c9a 100644
--- a/tests/view_tests/tests/test_defaults.py
+++ b/tests/view_tests/tests/test_defaults.py
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
import datetime
-from django.contrib.auth.models import User
from django.contrib.sites.models import Site
from django.http import Http404
from django.template import TemplateDoesNotExist
@@ -23,12 +22,6 @@ class DefaultsTests(TestCase):
@classmethod
def setUpTestData(cls):
- User.objects.create(
- password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
- last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
- first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
- date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
- )
Author.objects.create(name='Boris')
Article.objects.create(
title='Old Article', slug='old_article', author_id=1,