Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Modified tests introduced in r15452 to not run 31 test cases twice. T…

…hanks Julien for discovering this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4bbacd2663aab52bc8e55d2051dc69f42b982f42 1 parent e0d78f8
@ramiro ramiro authored
Showing with 13 additions and 5 deletions.
  1. +13 −5 tests/regressiontests/admin_views/tests.py
View
18 tests/regressiontests/admin_views/tests.py
@@ -607,14 +607,22 @@ def test_filter_with_custom_template(self):
self.assertTrue('custom_filter_template.html' in [t.name for t in response.templates])
-class AdminJavaScriptTest(AdminViewBasicTest):
+class AdminJavaScriptTest(TestCase):
+ fixtures = ['admin-views-users.xml']
+
urls = "regressiontests.admin_views.urls"
+ def setUp(self):
+ self.client.login(username='super', password='secret')
+
+ def tearDown(self):
+ self.client.logout()
+
def testSingleWidgetFirsFieldFocus(self):
"""
JavaScript-assisted auto-focus on first field.
"""
- response = self.client.get('/test_admin/%s/admin_views/picture/add/' % self.urlbit)
+ response = self.client.get('/test_admin/%s/admin_views/picture/add/' % 'admin')
self.assertContains(
response,
'<script type="text/javascript">document.getElementById("id_name").focus();</script>'
@@ -625,7 +633,7 @@ def testMultiWidgetFirsFieldFocus(self):
JavaScript-assisted auto-focus should work if a model/ModelAdmin setup
is such that the first form field has a MultiWidget.
"""
- response = self.client.get('/test_admin/%s/admin_views/reservation/add/' % self.urlbit)
+ response = self.client.get('/test_admin/%s/admin_views/reservation/add/' % 'admin')
self.assertContains(
response,
'<script type="text/javascript">document.getElementById("id_start_date_0").focus();</script>'
@@ -640,7 +648,7 @@ def test_js_minified_only_if_debug_is_false(self):
"""
with override_settings(DEBUG=False):
response = self.client.get(
- '/test_admin/%s/admin_views/section/add/' % self.urlbit)
+ '/test_admin/%s/admin_views/section/add/' % 'admin')
self.assertNotContains(response, 'jquery.js')
self.assertContains(response, 'jquery.min.js')
self.assertNotContains(response, 'prepopulate.js')
@@ -653,7 +661,7 @@ def test_js_minified_only_if_debug_is_false(self):
self.assertContains(response, 'inlines.min.js')
with override_settings(DEBUG=True):
response = self.client.get(
- '/test_admin/%s/admin_views/section/add/' % self.urlbit)
+ '/test_admin/%s/admin_views/section/add/' % 'admin')
self.assertContains(response, 'jquery.js')
self.assertNotContains(response, 'jquery.min.js')
self.assertContains(response, 'prepopulate.js')
Please sign in to comment.
Something went wrong with that request. Please try again.