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

[1.4.X] Fixed #19051 - Fixed Selenium tearDownClass method; thanks glarrain for the report. 

Backport of a1a5c0854f from master
This commit is contained in:
Tim Graham 2012-10-04 06:45:22 -04:00
parent 8868a067e0
commit a35d7fd1e1
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

@ -25,9 +25,9 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
@classmethod
def tearDownClass(cls):
super(AdminSeleniumWebDriverTestCase, cls).tearDownClass()
if hasattr(cls, 'selenium'):
cls.selenium.quit()
super(AdminSeleniumWebDriverTestCase, cls).tearDownClass()
def wait_until(self, callback, timeout=10):
"""
@ -102,4 +102,4 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
`klass`.
"""
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

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