[tests] Fixed tests

Author: pandafy

openwisp_firmware_upgrader/tests/test_selenium.py

@@ -84,14 +84,14 @@ def tearDown(self):
         try:
             self.web_driver.refresh()
         except UnexpectedAlertPresentException:
-            self.web_driver.switch_to_alert().accept()
+            self.web_driver.switch_to_alert.accept()
         else:
             try:
                 WebDriverWait(self.web_driver, 1).until(EC.alert_is_present())
             except TimeoutException:
                 pass
             else:
-                self.web_driver.switch_to_alert().accept()
+                self.web_driver.switch_to_alert.accept()
         self.web_driver.refresh()
         WebDriverWait(self.web_driver, 2).until(
             EC.visibility_of_element_located((By.XPATH, '//*[@id="site-name"]'))
@@ -108,6 +108,14 @@ def _assert_loading_overlay_hidden(self):
             EC.invisibility_of_element((By.CSS_SELECTOR, '#loading-overlay'))
         )
 
+    def open(self, url, driver=None):
+        super().open(url, driver)
+        driver = driver or self.web_driver
+        WebDriverWait(driver, 5).until(
+            lambda d: d.execute_script('return document.readyState') == 'complete'
+        )
+        self._assert_loading_overlay_hidden()
+
     @capture_any_output()
     def test_restoring_deleted_device(self):
         org = self._get_org()
@@ -147,6 +155,9 @@ def test_restoring_deleted_device(self):
                 f'admin:{self.config_app_label}_device_recover', args=[version_obj.id]
             )
         )
+        WebDriverWait(self.web_driver, 5).until(
+            EC.invisibility_of_element((By.ID, "command_set-group"))
+        )
         WebDriverWait(self.web_driver, 5).until(
             EC.element_to_be_clickable(
                 (By.XPATH, '//*[@id="device_form"]/div/div[1]/input[1]')
@@ -177,6 +188,12 @@ def save_device():
             self.web_driver.find_element(
                 by=By.XPATH, value='//*[@id="device_form"]/div/div[1]/input[3]'
             ).click()
+            WebDriverWait(self.web_driver, 2).until(
+                EC.visibility_of_all_elements_located(
+                    (By.CSS_SELECTOR, '#devicefirmware-group')
+                )
+            )
+            self._assert_loading_overlay_hidden()
 
         _, _, _, _, _, image, device = self._set_up_env()
         self.login()
@@ -194,7 +211,6 @@ def save_device():
             )
         )
         image_select = self._get_device_firmware_dropdown_select()
-        self._assert_loading_overlay_hidden()
         image_select.select_by_value(str(image.pk))
         # JSONSchema configuration editor should not be rendered
         WebDriverWait(self.web_driver, 1).until(
@@ -238,7 +254,6 @@ def save_device():
         # When adding firmware to the device for the first time,
         # JSONSchema editor should be rendered only when the image
         # is selected
-        self._assert_loading_overlay_hidden()
         self.web_driver.find_element(
             by=By.XPATH, value='//*[@id="devicefirmware-group"]/fieldset/div[2]/a'
         ).click()
@@ -371,7 +386,6 @@ def test_upgrader_with_unsupported_upgrade_options(self, *args):
                 )
             )
             image_select = self._get_device_firmware_dropdown_select()
-            self._assert_loading_overlay_hidden()
             image_select.select_by_value(str(image2.pk))
             # Ensure JSONSchema editor is not rendered because
             # the upgrader does not define a schema