Skip to content

Commit 6c8df61

Browse files
committed
Always pass in a parameter to the show_toolbar and hide_toolbar functions.
1 parent fd30dab commit 6c8df61

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

tests/test_javascript.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def tearDownClass(cls):
4242
super(InitTestCase, cls).tearDownClass()
4343

4444
def setUp(self):
45+
self.selenium.delete_all_cookies()
4546
self.selenium.get(self.live_server_url + '/execute_sql/')
4647
self.panel_class = "HeadersPanel"
4748
self.panel_trigger = self.selenium.find_element(
@@ -52,9 +53,6 @@ def setUp(self):
5253
WebDriverWait(self.selenium, timeout=10).until(
5354
lambda selenium: self.panel_trigger.is_displayed())
5455

55-
def tearDown(self):
56-
self.selenium.delete_all_cookies()
57-
5856
def test_show_toolbar(self):
5957
toolbar = self.selenium.find_element_by_id('djDebug')
6058
self.assertTrue(toolbar.is_displayed())
@@ -281,6 +279,7 @@ def tearDownClass(cls):
281279
super(APITestCase, cls).tearDownClass()
282280

283281
def setUp(self):
282+
self.selenium.delete_all_cookies()
284283
self.selenium.get(self.live_server_url + '/execute_sql/')
285284
self.panel_class = "HeadersPanel"
286285
self.panel_trigger = self.selenium.find_element(
@@ -290,17 +289,14 @@ def setUp(self):
290289
WebDriverWait(self.selenium, timeout=10).until(
291290
lambda selenium: self.panel_trigger.is_displayed())
292291

293-
def tearDown(self):
294-
self.selenium.delete_all_cookies()
295-
296292
def test_show_toolbar(self):
297-
self.selenium.execute_script("djdt.close()")
293+
self.selenium.execute_script("djdt.hide_toolbar(false)")
298294
# Verify that it closes the toolbar.
299295
self.assertTrue(WebDriverWait(self.selenium, timeout=10).until(
300296
lambda selenium:
301297
selenium.find_element_by_id('djDebugToolbarHandle').is_displayed())
302298
)
303-
self.selenium.execute_script("djdt.show_toolbar()")
299+
self.selenium.execute_script("djdt.show_toolbar(true)")
304300
self.assertFalse(
305301
self.selenium.find_element_by_id('djDebugToolbarHandle').is_displayed()
306302
)

0 commit comments

Comments
 (0)