Corrected admin_views tests following removal of the email fallback on admin logins.
This commit is contained in:
Russell Keith-Magee
parent
20d1892491
commit
2c5e833a30
|
|
@ -52,6 +52,7 @@ from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount,
|
|||
ERROR_MESSAGE = "Please enter the correct username and password \
|
||||
for a staff account. Note that both fields are case-sensitive."
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminViewBasicTest(TestCase):
|
||||
fixtures = ['admin-views-users.xml', 'admin-views-colors.xml',
|
||||
|
|
@ -303,7 +304,7 @@ class AdminViewBasicTest(TestCase):
|
|||
self.assertContentBefore(response, link % l2.pk, link % l1.pk)
|
||||
|
||||
# Test we can override with query string
|
||||
response = self.client.get('/test_admin/admin/admin_views/language/', {'o':'-1'})
|
||||
response = self.client.get('/test_admin/admin/admin_views/language/', {'o': '-1'})
|
||||
self.assertContentBefore(response, link % l1.pk, link % l2.pk)
|
||||
|
||||
def testChangeListSortingOverrideModelAdmin(self):
|
||||
|
|
@ -350,10 +351,10 @@ class AdminViewBasicTest(TestCase):
|
|||
kinds of 'ordering' fields: field names, method on the model
|
||||
admin and model itself, and other callables. See #17252.
|
||||
"""
|
||||
models = [(AdminOrderedField, 'adminorderedfield' ),
|
||||
models = [(AdminOrderedField, 'adminorderedfield'),
|
||||
(AdminOrderedModelMethod, 'adminorderedmodelmethod'),
|
||||
(AdminOrderedAdminMethod, 'adminorderedadminmethod'),
|
||||
(AdminOrderedCallable, 'adminorderedcallable' )]
|
||||
(AdminOrderedCallable, 'adminorderedcallable')]
|
||||
for model, url in models:
|
||||
a1 = model.objects.create(stuff='The Last Item', order=3)
|
||||
a2 = model.objects.create(stuff='The First Item', order=1)
|
||||
|
|
@ -578,6 +579,7 @@ class AdminViewBasicTest(TestCase):
|
|||
(self.urlbit, instance.pk))
|
||||
self.assertNotContains(response, 'deletelink')
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminViewFormUrlTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -643,7 +645,6 @@ class AdminJavaScriptTest(TestCase):
|
|||
'<script type="text/javascript">document.getElementById("id_start_date_0").focus();</script>'
|
||||
)
|
||||
|
||||
|
||||
def test_js_minified_only_if_debug_is_false(self):
|
||||
"""
|
||||
Ensure that the minified versions of the JS files are only used when
|
||||
|
|
@ -681,7 +682,7 @@ class AdminJavaScriptTest(TestCase):
|
|||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class SaveAsTests(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
fixtures = ['admin-views-users.xml','admin-views-person.xml']
|
||||
fixtures = ['admin-views-users.xml', 'admin-views-person.xml']
|
||||
|
||||
def setUp(self):
|
||||
self.client.login(username='super', password='secret')
|
||||
|
|
@ -691,7 +692,7 @@ class SaveAsTests(TestCase):
|
|||
|
||||
def test_save_as_duplication(self):
|
||||
"""Ensure save as actually creates a new person"""
|
||||
post_data = {'_saveasnew':'', 'name':'John M', 'gender':1, 'age': 42}
|
||||
post_data = {'_saveasnew': '', 'name': 'John M', 'gender': 1, 'age': 42}
|
||||
response = self.client.post('/test_admin/admin/admin_views/person/1/', post_data)
|
||||
self.assertEqual(len(Person.objects.filter(name='John M')), 1)
|
||||
self.assertEqual(len(Person.objects.filter(id=1)), 1)
|
||||
|
|
@ -704,10 +705,11 @@ class SaveAsTests(TestCase):
|
|||
"""
|
||||
response = self.client.get('/test_admin/admin/admin_views/person/1/')
|
||||
self.assertTrue(response.context['save_as'])
|
||||
post_data = {'_saveasnew':'', 'name':'John M', 'gender':3, 'alive':'checked'}
|
||||
post_data = {'_saveasnew': '', 'name': 'John M', 'gender': 3, 'alive': 'checked'}
|
||||
response = self.client.post('/test_admin/admin/admin_views/person/1/', post_data)
|
||||
self.assertEqual(response.context['form_url'], '/test_admin/admin/admin_views/person/add/')
|
||||
|
||||
|
||||
class CustomModelAdminTest(AdminViewBasicTest):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
urlbit = "admin2"
|
||||
|
|
@ -763,11 +765,13 @@ class CustomModelAdminTest(AdminViewBasicTest):
|
|||
response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
|
||||
self.assertEqual(response.content, b"Django is a magical pony!")
|
||||
|
||||
|
||||
def get_perm(Model, perm):
|
||||
"""Return the permission object, for the Model"""
|
||||
ct = ContentType.objects.get_for_model(Model)
|
||||
return Permission.objects.get(content_type=ct, codename=perm)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminViewPermissionsTest(TestCase):
|
||||
"""Tests for Admin Views Permissions."""
|
||||
|
|
@ -870,7 +874,7 @@ class AdminViewPermissionsTest(TestCase):
|
|||
response = self.client.get('/test_admin/admin/')
|
||||
self.assertEqual(response.status_code, 200)
|
||||
login = self.client.post('/test_admin/admin/', self.super_email_login)
|
||||
self.assertContains(login, "Your e-mail address is not your username")
|
||||
self.assertContains(login, ERROR_MESSAGE)
|
||||
# only correct passwords get a username hint
|
||||
login = self.client.post('/test_admin/admin/', self.super_email_bad_login)
|
||||
self.assertContains(login, ERROR_MESSAGE)
|
||||
|
|
@ -931,7 +935,7 @@ class AdminViewPermissionsTest(TestCase):
|
|||
def testAddView(self):
|
||||
"""Test add view restricts access and actually adds items."""
|
||||
|
||||
add_dict = {'title' : 'Døm ikke',
|
||||
add_dict = {'title': 'Døm ikke',
|
||||
'content': '<p>great article</p>',
|
||||
'date_0': '2008-03-18', 'date_1': '10:54:39',
|
||||
'section': 1}
|
||||
|
|
@ -986,7 +990,7 @@ class AdminViewPermissionsTest(TestCase):
|
|||
def testChangeView(self):
|
||||
"""Change view should restrict access and allow users to edit items."""
|
||||
|
||||
change_dict = {'title' : 'Ikke fordømt',
|
||||
change_dict = {'title': 'Ikke fordømt',
|
||||
'content': '<p>edited article</p>',
|
||||
'date_0': '2008-03-18', 'date_1': '10:54:39',
|
||||
'section': 1}
|
||||
|
|
@ -1318,6 +1322,7 @@ class AdminViewDeletedObjectsTest(TestCase):
|
|||
response = self.client.get('/test_admin/admin/admin_views/plot/%s/delete/' % quote(3))
|
||||
self.assertContains(response, should_contain)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminViewStringPrimaryKeyTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -1479,7 +1484,7 @@ class SecureViewTests(TestCase):
|
|||
|
||||
def test_secure_view_shows_login_if_not_logged_in(self):
|
||||
"Ensure that we see the login form"
|
||||
response = self.client.get('/test_admin/admin/secure-view/' )
|
||||
response = self.client.get('/test_admin/admin/secure-view/')
|
||||
self.assertTemplateUsed(response, 'admin/login.html')
|
||||
|
||||
def test_secure_view_login_successfully_redirects_to_original_url(self):
|
||||
|
|
@ -1513,7 +1518,7 @@ class SecureViewTests(TestCase):
|
|||
response = self.client.get('/test_admin/admin/secure-view/')
|
||||
self.assertEqual(response.status_code, 200)
|
||||
login = self.client.post('/test_admin/admin/secure-view/', self.super_email_login)
|
||||
self.assertContains(login, "Your e-mail address is not your username")
|
||||
self.assertContains(login, ERROR_MESSAGE)
|
||||
# only correct passwords get a username hint
|
||||
login = self.client.post('/test_admin/admin/secure-view/', self.super_email_bad_login)
|
||||
self.assertContains(login, ERROR_MESSAGE)
|
||||
|
|
@ -1583,6 +1588,7 @@ class SecureViewTests(TestCase):
|
|||
self.assertEqual(response.status_code, 302)
|
||||
self.assertEqual(response['Location'], 'http://example.com/users/super/')
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminViewUnicodeTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -2064,7 +2070,7 @@ class AdminSearchTest(TestCase):
|
|||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminInheritedInlinesTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
fixtures = ['admin-views-users.xml',]
|
||||
fixtures = ['admin-views-users.xml']
|
||||
|
||||
def setUp(self):
|
||||
self.client.login(username='super', password='secret')
|
||||
|
|
@ -2148,6 +2154,7 @@ class AdminInheritedInlinesTest(TestCase):
|
|||
self.assertEqual(BarAccount.objects.all()[0].username, "%s-1" % bar_user)
|
||||
self.assertEqual(Persona.objects.all()[0].accounts.count(), 2)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminActionsTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -2163,7 +2170,7 @@ class AdminActionsTest(TestCase):
|
|||
"Tests a custom action defined in a ModelAdmin method"
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1],
|
||||
'action' : 'mail_admin',
|
||||
'action': 'mail_admin',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)
|
||||
|
|
@ -2174,12 +2181,12 @@ class AdminActionsTest(TestCase):
|
|||
"Tests the default delete action defined as a ModelAdmin method"
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1, 2],
|
||||
'action' : 'delete_selected',
|
||||
'action': 'delete_selected',
|
||||
'index': 0,
|
||||
}
|
||||
delete_confirmation_data = {
|
||||
ACTION_CHECKBOX_NAME: [1, 2],
|
||||
'action' : 'delete_selected',
|
||||
'action': 'delete_selected',
|
||||
'post': 'yes',
|
||||
}
|
||||
confirmation = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)
|
||||
|
|
@ -2203,7 +2210,7 @@ class AdminActionsTest(TestCase):
|
|||
subscriber.save()
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [9999, 2],
|
||||
'action' : 'delete_selected',
|
||||
'action': 'delete_selected',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)
|
||||
|
|
@ -2225,7 +2232,7 @@ class AdminActionsTest(TestCase):
|
|||
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [q1.pk, q2.pk],
|
||||
'action' : 'delete_selected',
|
||||
'action': 'delete_selected',
|
||||
'index': 0,
|
||||
}
|
||||
|
||||
|
|
@ -2239,7 +2246,7 @@ class AdminActionsTest(TestCase):
|
|||
"Tests a custom action defined in a function"
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1],
|
||||
'action' : 'external_mail',
|
||||
'action': 'external_mail',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
|
||||
|
|
@ -2250,7 +2257,7 @@ class AdminActionsTest(TestCase):
|
|||
"Tests a custom action defined in a function"
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1],
|
||||
'action' : 'redirect_to',
|
||||
'action': 'redirect_to',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
|
||||
|
|
@ -2264,7 +2271,7 @@ class AdminActionsTest(TestCase):
|
|||
"""
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1],
|
||||
'action' : 'external_mail',
|
||||
'action': 'external_mail',
|
||||
'index': 0,
|
||||
}
|
||||
url = '/test_admin/admin/admin_views/externalsubscriber/?o=1'
|
||||
|
|
@ -2329,7 +2336,7 @@ class AdminActionsTest(TestCase):
|
|||
"""
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [],
|
||||
'action' : 'delete_selected',
|
||||
'action': 'delete_selected',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)
|
||||
|
|
@ -2343,7 +2350,7 @@ class AdminActionsTest(TestCase):
|
|||
"""
|
||||
action_data = {
|
||||
ACTION_CHECKBOX_NAME: [1, 2],
|
||||
'action' : '',
|
||||
'action': '',
|
||||
'index': 0,
|
||||
}
|
||||
response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)
|
||||
|
|
@ -2415,6 +2422,7 @@ class TestInlineNotEditable(TestCase):
|
|||
response = self.client.get('/test_admin/admin/admin_views/parent/add/')
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminCustomQuerysetTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -2471,6 +2479,7 @@ class AdminCustomQuerysetTest(TestCase):
|
|||
# Message should contain non-ugly model name. Instance representation is set by model's __unicode__()
|
||||
self.assertContains(response, '<li class="info">The cover letter "John Doe II" was changed successfully.</li>', html=True)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminInlineFileUploadTest(TestCase):
|
||||
urls = "regressiontests.admin_views.urls"
|
||||
|
|
@ -2611,7 +2620,7 @@ class AdminInlineTests(TestCase):
|
|||
|
||||
result = self.client.login(username='super', password='secret')
|
||||
self.assertEqual(result, True)
|
||||
self.collector = Collector(pk=1,name='John Fowles')
|
||||
self.collector = Collector(pk=1, name='John Fowles')
|
||||
self.collector.save()
|
||||
|
||||
def tearDown(self):
|
||||
|
|
@ -2937,7 +2946,7 @@ class PrePopulatedTest(TestCase):
|
|||
self.assertNotContains(response, "field['dependency_ids'].push('#id_title');")
|
||||
self.assertNotContains(response, "id: '#id_prepopulatedsubpost_set-0-subslug',")
|
||||
|
||||
@override_settings(USE_THOUSAND_SEPARATOR = True, USE_L10N = True)
|
||||
@override_settings(USE_THOUSAND_SEPARATOR=True, USE_L10N=True)
|
||||
def test_prepopulated_maxlength_localized(self):
|
||||
"""
|
||||
Regression test for #15938: if USE_THOUSAND_SEPARATOR is set, make sure
|
||||
|
|
@ -3067,6 +3076,7 @@ class SeleniumPrePopulatedFirefoxTests(AdminSeleniumWebDriverTestCase):
|
|||
class SeleniumPrePopulatedChromeTests(SeleniumPrePopulatedFirefoxTests):
|
||||
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
|
||||
|
||||
|
||||
class SeleniumPrePopulatedIETests(SeleniumPrePopulatedFirefoxTests):
|
||||
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
|
||||
|
||||
|
|
@ -3179,6 +3189,7 @@ class RawIdFieldsTest(TestCase):
|
|||
self.assertContains(response2, "Spain")
|
||||
self.assertNotContains(response2, "England")
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class UserAdminTest(TestCase):
|
||||
"""
|
||||
|
|
@ -3345,6 +3356,7 @@ try:
|
|||
except ImportError:
|
||||
docutils = None
|
||||
|
||||
|
||||
@unittest.skipUnless(docutils, "no docutils installed.")
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminDocsTest(TestCase):
|
||||
|
|
@ -3403,7 +3415,7 @@ class ValidXHTMLTests(TestCase):
|
|||
|
||||
@override_settings(
|
||||
TEMPLATE_CONTEXT_PROCESSORS=filter(
|
||||
lambda t:t!='django.core.context_processors.i18n',
|
||||
lambda t: t != 'django.core.context_processors.i18n',
|
||||
global_settings.TEMPLATE_CONTEXT_PROCESSORS),
|
||||
USE_I18N=False,
|
||||
)
|
||||
|
|
@ -3540,6 +3552,7 @@ class DateHierarchyTests(TestCase):
|
|||
self.assert_non_localized_year(response, 2003)
|
||||
self.assert_non_localized_year(response, 2005)
|
||||
|
||||
|
||||
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
class AdminCustomSaveRelatedTests(TestCase):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue