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

Enabled the admin selenium tests to run on Chrome. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip 2012-02-22 07:14:10 +00:00
parent 354c84d277
commit a65eed3942
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/regressiontests/admin_inlines/tests.py
View File

@ -383,6 +383,7 @@ class TestInlinePermissions(TestCase):
self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id) self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
self.assertContains(response, 'id="id_inner2_set-0-DELETE"') self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver' webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
fixtures = ['admin-views-users.xml'] fixtures = ['admin-views-users.xml']
@ -487,3 +488,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
'form#profilecollection_form tr.dynamic-profile_set#profile_set-1')), 1) 'form#profilecollection_form tr.dynamic-profile_set#profile_set-1')), 1)
self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector( self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form tr.dynamic-profile_set#profile_set-2')), 1) 'form#profilecollection_form tr.dynamic-profile_set#profile_set-2')), 1)
class SeleniumChromeTests(SeleniumFirefoxTests):
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'

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

@ -2894,7 +2894,8 @@ class PrePopulatedTest(TestCase):
self.assertContains(response, "maxLength: 1000") # instead of 1,000 self.assertContains(response, "maxLength: 1000") # instead of 1,000
class SeleniumPrePopulatedTests(AdminSeleniumWebDriverTestCase): class SeleniumPrePopulatedFirefoxTests(AdminSeleniumWebDriverTestCase):
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
urls = "regressiontests.admin_views.urls" urls = "regressiontests.admin_views.urls"
fixtures = ['admin-views-users.xml'] fixtures = ['admin-views-users.xml']
@ -2997,6 +2998,11 @@ class SeleniumPrePopulatedTests(AdminSeleniumWebDriverTestCase):
slug2='option-one-tabular-inline-ignored-characters', slug2='option-one-tabular-inline-ignored-characters',
) )
class SeleniumPrePopulatedChromeTests(SeleniumPrePopulatedFirefoxTests):
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
class ReadonlyTest(TestCase): class ReadonlyTest(TestCase):
urls = "regressiontests.admin_views.urls" urls = "regressiontests.admin_views.urls"
fixtures = ['admin-views-users.xml'] fixtures = ['admin-views-users.xml']

7
tests/regressiontests/admin_widgets/tests.py
View File

@ -438,7 +438,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
self.assertEqual( self.assertEqual(
self.get_css_value('#calendarbox0', 'display'), 'block') self.get_css_value('#calendarbox0', 'display'), 'block')
# Press the ESC key # Press the ESC key
self.selenium.find_element_by_tag_name('html').send_keys([Keys.ESCAPE]) self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE])
# Check that the date picker is hidden again # Check that the date picker is hidden again
self.assertEqual( self.assertEqual(
self.get_css_value('#calendarbox0', 'display'), 'none') self.get_css_value('#calendarbox0', 'display'), 'none')
@ -453,7 +453,10 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
self.assertEqual( self.assertEqual(
self.get_css_value('#clockbox0', 'display'), 'block') self.get_css_value('#clockbox0', 'display'), 'block')
# Press the ESC key # Press the ESC key
self.selenium.find_element_by_tag_name('html').send_keys([Keys.ESCAPE]) self.selenium.find_element_by_tag_name('body').send_keys([Keys.ESCAPE])
# Check that the time picker is hidden again # Check that the time picker is hidden again
self.assertEqual( self.assertEqual(
self.get_css_value('#clockbox0', 'display'), 'none') self.get_css_value('#clockbox0', 'display'), 'none')
class SeleniumChromeTests(SeleniumFirefoxTests):
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'