Moved XhrPending test case on its own selenium instance with explicit…

… waits
jrwagz · Jan 28, 2014 · 07ff404 · 07ff404
1 parent 903edf8
commit 07ff404
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/autocomplete_light/tests/__init__.py b/autocomplete_light/tests/__init__.py
@@ -29,6 +29,7 @@
     SelectChoiceInEmptyFormTestCase,
     WidgetInitialStatusInEditForm,
     RemoveChoiceInEditFormTestCase,
+    XhrPendingTestCase,
     KeyboardTestCase,
     InlineBlankTestCase,
     InlineSelectChoiceTestCase,

diff --git a/autocomplete_light/tests/widget.py b/autocomplete_light/tests/widget.py
@@ -9,6 +9,8 @@
 from selenium.webdriver.common.keys import Keys
 from selenium import webdriver
 from selenium.webdriver.support import ui
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
 
 
 if VERSION[0] == 1 and VERSION[1] < 7:
@@ -213,12 +215,18 @@ def test_autocomplete_shows_up(self):
     def test_autocomplete_has_four_choices(self):
         self.assertEqual(4, len(self.autocomplete_choices()))
 
+class XhrPendingTestCase(WidgetTestCase):
+    def setup_test_case(self):
+        self.login()
+        self.open_url('/admin/basic/fkmodel/add/')
+
     def test_xhr_pending(self):
-        self.selenium.find_element_by_css_selector(
-            'input.xhr-pending[name=%s-autocomplete]' % self.autocomplete_name)
+        self.send_keys('ja')
+        ui.WebDriverWait(self.selenium, 15).until(EC.presence_of_element_located((By.CSS_SELECTOR,
+            'input.xhr-pending[name=%s-autocomplete]' % self.autocomplete_name)))
 
-        self.selenium.find_element_by_css_selector(
-            'input:not(.xhr-pending)[name=%s-autocomplete]' % self.autocomplete_name)
+        ui.WebDriverWait(self.selenium, 15).until(EC.presence_of_element_located((By.CSS_SELECTOR,
+            'input:not(.xhr-pending)[name=%s-autocomplete]' % self.autocomplete_name)))
 
 
 class SelectChoiceInEmptyFormTestCase(WidgetTestCase):