innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #19051 - Fixed Selenium tearDownClass method; thanks glarrain for the report.

This commit is contained in:
Tim Graham 2012-10-04 06:45:22 -04:00
parent 7251282893
commit a1a5c0854f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/tests.py
View File

@ -21,9 +21,9 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
super(AdminSeleniumWebDriverTestCase, cls).tearDownClass()
if hasattr(cls, 'selenium'): if hasattr(cls, 'selenium'):
cls.selenium.quit() cls.selenium.quit()
super(AdminSeleniumWebDriverTestCase, cls).tearDownClass()
def wait_until(self, callback, timeout=10): def wait_until(self, callback, timeout=10):
""" """
@ -98,4 +98,4 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
`klass`. `klass`.
""" """
return (self.selenium.find_element_by_css_selector(selector) return (self.selenium.find_element_by_css_selector(selector)
.get_attribute('class').find(klass) != -1) .get_attribute('class').find(klass) != -1)

2
docs/topics/testing.txt
View File

@ -1973,8 +1973,8 @@ Then, add a ``LiveServerTestCase``-based test to your app's tests module
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
super(MySeleniumTests, cls).tearDownClass()
cls.selenium.quit() cls.selenium.quit()
super(MySeleniumTests, cls).tearDownClass()
def test_login(self): def test_login(self):
self.selenium.get('%s%s' % (self.live_server_url, '/login/')) self.selenium.get('%s%s' % (self.live_server_url, '/login/'))