fix(tests): enable waiting for profile name input in server setup

Author: Shadow243

tests/selenium/folder_list.py

@@ -21,13 +21,22 @@ def reload_folder_list(self):
         assert main_menu.is_displayed()
         self.by_class('update_message_list').click()
         self.safari_workaround(3)
-        # update_message_list triggers site reload, so we explicitly wait for element to become stale
-        WebDriverWait(self.driver, 20).until(EC.staleness_of(main_menu))
-        ignored_exceptions=(NoSuchElementException,StaleElementReferenceException,)
-        # And once it is stale, we can now wait for it to become available again as the page contents are loaded again.
-        main_menu = WebDriverWait(self.driver, 10,ignored_exceptions=ignored_exceptions).until(
-            EC.presence_of_element_located((By.CLASS_NAME, 'main'))
-        )
+        # update_message_list triggers AJAX reload, so we wait for the spinner to disappear
+        # and then wait for the folder list to be updated
+        try:
+            # Wait for spinner to appear and then disappear (indicating AJAX completion)
+            WebDriverWait(self.driver, 10).until(
+                lambda driver: len(driver.find_elements(By.CLASS_NAME, "spinner-border")) > 0
+            )
+            WebDriverWait(self.driver, 10).until(
+                lambda driver: len(driver.find_elements(By.CLASS_NAME, "spinner-border")) == 0
+            )
+        except:
+            # If spinner doesn't appear, just wait a bit for the AJAX to complete
+            import time
+            time.sleep(2)
+        
+        # Verify the main menu is still displayed after the reload
         main_menu = self.by_class('main')
         assert main_menu.is_displayed()
 

tests/selenium/login.py

@@ -53,9 +53,11 @@ def good_logout(self):
         self.logout()
         self.wait()
         self.safari_workaround()
-        self.wait_on_class('sys_messages')
-        sys_messages = self.by_class('sys_messages')
-        assert sys_messages is not None
+        self.wait_on_class('login_form')
+        # debugging line
+        print('debugging line')
+        print(self.by_class('login_form'))
+        assert self.by_class('login_form') != None
 
 if __name__ == '__main__':
 

tests/selenium/servers.py

@@ -31,8 +31,39 @@ def load_servers_page(self):
     def server_stmp_and_imap_add(self):
         self.toggle_server_section('server_config')
         self.wait_on_class('imap-jmap-smtp-btn')
-        self.by_id('add_new_server_button').click()
-        # self.wait_on_class('srv_setup_stepper_profile_name')
+
+        # Wait for the add button to be clickable (combines presence and clickability)
+        add_button = WebDriverWait(self.driver, 10).until(
+            EC.element_to_be_clickable((By.ID, "add_new_server_button"))
+        )
+        
+        # Scroll the button into view before clicking
+        self.driver.execute_script("arguments[0].scrollIntoView({behavior: 'smooth', block: 'center'});", add_button)
+        sleep(0.5)
+
+        try:
+            add_button.click()
+            print("Normal click succeeded")
+        except Exception as e:
+            print(f"Normal click failed: {e}. Trying JavaScript click...")
+            self.driver.execute_script("arguments[0].click();", add_button)
+        
+        # Wait for the form to appear after clicking
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.any_of(
+                    EC.presence_of_element_located((By.ID, 'srv_setup_stepper_profile_name')),
+                    EC.presence_of_element_located((By.NAME, 'srv_setup_stepper_profile_name'))
+                )
+            )
+            print("Server setup form appeared")
+        except Exception as e:
+            print(f"Server setup form did not appear: {e}")
+            # Debug: print current page state
+            print("Current URL:", self.driver.current_url)
+            print("Page title:", self.driver.title)
+            raise e
+
         name = self.by_id('srv_setup_stepper_profile_name')
         name.send_keys('Test')
         email = self.by_name('srv_setup_stepper_email')