[tests] Improve Selenium test efficiency #868

Refactored WebDriverWait usage to use built-in expected conditions. Fixes #868
openwisp · Jan 22, 2025 · ade1905 · ade1905
1 parent 937f2f2
commit ade1905
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/openwisp_controller/config/tests/test_selenium.py b/openwisp_controller/config/tests/test_selenium.py
@@ -133,18 +133,11 @@ def test_create_new_device(self):
         )
 
     def test_device_preview_keyboard_shortcuts(self):
-        self._create_config(device=self._create_device(name='Test'))
+        device = self._create_config(device=self._create_device(name='Test')).device
         self.login()
         self.open(reverse('admin:config_device_changelist'))
-
-        # open first device in the list
-        self.web_driver.find_element(
-            by=By.CSS_SELECTOR, value='tbody tr:nth-child(1) th a'
-        ).click()
         try:
-            WebDriverWait(self.web_driver, 2).until(
-                EC.presence_of_element_located((By.CSS_SELECTOR, '#content-main'))
-            )
+            self.open(reverse('admin:config_device_change', args=[device.id]))
         except TimeoutException:
             self.fail('Device detail page did not load in time')
 
@@ -153,10 +146,9 @@ def test_device_preview_keyboard_shortcuts(self):
             actions.key_down(Keys.ALT).send_keys('p').key_up(Keys.ALT).perform()
             try:
                 WebDriverWait(self.web_driver, 2).until(
-                    lambda driver: driver.find_element(
-                        By.CSS_SELECTOR, '.djnjc-overlay:not(.loading)'
-                    ).value_of_css_property('display')
-                    != 'none'
+                    EC.invisibility_of_element_located(
+                        (By.CSS_SELECTOR, '.djnjc-overlay:not(.loading)')
+                    )
                 )
             except TimeoutException:
                 self.fail('The preview overlay is unexpectedly not visible')
@@ -166,10 +158,9 @@ def test_device_preview_keyboard_shortcuts(self):
             actions.send_keys(Keys.ESCAPE).perform()
             try:
                 WebDriverWait(self.web_driver, 2).until(
-                    lambda driver: driver.find_element(
-                        By.CSS_SELECTOR, '.djnjc-overlay:not(.loading)'
-                    ).value_of_css_property('display')
-                    == 'none'
+                    EC.invisibility_of_element_located(
+                        (By.CSS_SELECTOR, '.djnjc-overlay:not(.loading)')
+                    )
                 )
             except TimeoutException:
                 self.fail('The preview overlay has not been closed as expected')