summaryrefslogtreecommitdiff
path: root/tests/admin_widgets/tests.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-14 19:35:34 -0500
committerTim Graham <timograham@gmail.com>2016-01-14 19:35:34 -0500
commit3486311a42728e0c9752bda16ac712797f5a6af9 (patch)
treea51a5876448f4f81a18ecf5779ade50bee71b220 /tests/admin_widgets/tests.py
parentae9f08882fbff81726767e0dce9ea6e0e7d3eb41 (diff)
downloaddjango-3486311a42728e0c9752bda16ac712797f5a6af9.tar.gz
Refs #26048 -- Fixed a flaky selenium test.
Diffstat (limited to 'tests/admin_widgets/tests.py')
-rw-r--r--tests/admin_widgets/tests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index ca395015f4..cbaeaa8353 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -1316,7 +1316,7 @@ class RelatedFieldWidgetSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWeb
self.selenium.find_element_by_css_selector(save_button_css_selector).click()
self.selenium.switch_to.window(main_window)
# The field now contains the new user
- self.assertSelectOptions('#id_user', ['', 'super', 'newuser'])
+ self.selenium.find_element_by_css_selector('#id_user option[value=newuser]')
# Click the Change User button to change it
self.selenium.find_element_by_id('change_id_user').click()
@@ -1331,10 +1331,7 @@ class RelatedFieldWidgetSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWeb
save_button_css_selector = '.submit-row > input[type=submit]'
self.selenium.find_element_by_css_selector(save_button_css_selector).click()
self.selenium.switch_to.window(main_window)
- # Wait up to 2 seconds for the new option to show up after clicking save in the popup.
- self.selenium.implicitly_wait(2)
self.selenium.find_element_by_css_selector('#id_user option[value=changednewuser]')
- self.selenium.implicitly_wait(0)
# Go ahead and submit the form to make sure it works
self.selenium.find_element_by_css_selector(save_button_css_selector).click()