From a65eed39425581b206f934dd6eed960af8a64f3e Mon Sep 17 00:00:00 2001
From: Julien Phalip <jphalip@gmail.com>
Date: Wed, 22 Feb 2012 07:14:10 +0000
Subject: [PATCH] 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
---
tests/regressiontests/admin_inlines/tests.py | 5 +++++
tests/regressiontests/admin_views/tests.py | 8 +++++++-
tests/regressiontests/admin_widgets/tests.py | 7 +++++--
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/regressiontests/admin_inlines/tests.py
index e00a56d364..bb8418be21 100644
--- a/tests/regressiontests/admin_inlines/tests.py
+++ b/tests/regressiontests/admin_inlines/tests.py
@@ -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, 'id="id_inner2_set-0-DELETE"')
+
class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
fixtures = ['admin-views-users.xml']
@@ -487,3 +488,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
'form#profilecollection_form tr.dynamic-profile_set#profile_set-1')), 1)
self.failUnlessEqual(len(self.selenium.find_elements_by_css_selector(
'form#profilecollection_form tr.dynamic-profile_set#profile_set-2')), 1)
+
+
+class SeleniumChromeTests(SeleniumFirefoxTests):
+ webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
\ No newline at end of file
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 7349dec947..0e036ff3f9 100755
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -2894,7 +2894,8 @@ class PrePopulatedTest(TestCase):
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"
fixtures = ['admin-views-users.xml']
@@ -2997,6 +2998,11 @@ class SeleniumPrePopulatedTests(AdminSeleniumWebDriverTestCase):
slug2='option-one-tabular-inline-ignored-characters',
)
+
+class SeleniumPrePopulatedChromeTests(SeleniumPrePopulatedFirefoxTests):
+ webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
+
+
class ReadonlyTest(TestCase):
urls = "regressiontests.admin_views.urls"
fixtures = ['admin-views-users.xml']
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py
index b678bb7e12..ded75f235c 100644
--- a/tests/regressiontests/admin_widgets/tests.py
+++ b/tests/regressiontests/admin_widgets/tests.py
@@ -438,7 +438,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
self.assertEqual(
self.get_css_value('#calendarbox0', 'display'), 'block')
# 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
self.assertEqual(
self.get_css_value('#calendarbox0', 'display'), 'none')
@@ -453,7 +453,10 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
self.assertEqual(
self.get_css_value('#clockbox0', 'display'), 'block')
# 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
self.assertEqual(
self.get_css_value('#clockbox0', 'display'), 'none')
+
+class SeleniumChromeTests(SeleniumFirefoxTests):
+ webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
\ No newline at end of file