test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified tests introduced in r15452 to not run 31 test cases twice. Thanks Julien for discovering this. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2012-02-27 13:29:56 +00:00
parent e0d78f898f
commit 4bbacd2663
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/regressiontests/admin_views/tests.py
View File

@ -607,14 +607,22 @@ class AdminViewFormUrlTest(TestCase):
self.assertTrue('custom_filter_template.html' in [t.name for t in response.templates]) 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" urls = "regressiontests.admin_views.urls"
def setUp(self):
self.client.login(username='super', password='secret')
def tearDown(self):
self.client.logout()
def testSingleWidgetFirsFieldFocus(self): def testSingleWidgetFirsFieldFocus(self):
""" """
JavaScript-assisted auto-focus on first field. 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( self.assertContains(
response, response,
'<script type="text/javascript">document.getElementById("id_name").focus();</script>' '<script type="text/javascript">document.getElementById("id_name").focus();</script>'
@ -625,7 +633,7 @@ class AdminJavaScriptTest(AdminViewBasicTest):
JavaScript-assisted auto-focus should work if a model/ModelAdmin setup JavaScript-assisted auto-focus should work if a model/ModelAdmin setup
is such that the first form field has a MultiWidget. 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( self.assertContains(
response, response,
'<script type="text/javascript">document.getElementById("id_start_date_0").focus();</script>' '<script type="text/javascript">document.getElementById("id_start_date_0").focus();</script>'
@ -640,7 +648,7 @@ class AdminJavaScriptTest(AdminViewBasicTest):
""" """
with override_settings(DEBUG=False): with override_settings(DEBUG=False):
response = self.client.get( 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.assertNotContains(response, 'jquery.js')
self.assertContains(response, 'jquery.min.js') self.assertContains(response, 'jquery.min.js')
self.assertNotContains(response, 'prepopulate.js') self.assertNotContains(response, 'prepopulate.js')
@ -653,7 +661,7 @@ class AdminJavaScriptTest(AdminViewBasicTest):
self.assertContains(response, 'inlines.min.js') self.assertContains(response, 'inlines.min.js')
with override_settings(DEBUG=True): with override_settings(DEBUG=True):
response = self.client.get( 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.assertContains(response, 'jquery.js')
self.assertNotContains(response, 'jquery.min.js') self.assertNotContains(response, 'jquery.min.js')
self.assertContains(response, 'prepopulate.js') self.assertContains(response, 'prepopulate.js')