Merge pull request #669 from immutable/test/windows-ui-test

test: improve windows deeplink in test

Author: nattb8

sample/Tests/test/test_windows.py

@@ -81,53 +81,38 @@ def login(self):
             raise SystemExit(f"App stuck in unknown scene: {current_scene}")
 
     def _perform_login(self):
-        """Perform normal login flow when app is in UnauthenticatedScene"""
-        try:
-            # Debug: Check what scene we're actually in and what objects exist
+        """Perform normal login flow when app is in UnauthenticatedScene.
+        Retries once if the first attempt fails (e.g. deep link dialog not handled)."""
+        for attempt in range(2):
             try:
                 current_scene = self.get_altdriver().get_current_scene()
-                print(f"DEBUG: _perform_login - current scene: {current_scene}")
-            except Exception as e:
-                print(f"DEBUG: Could not get current scene: {e}")
-            
-            # Wait a moment for UI to stabilize and check if app is still running
-            time.sleep(3)
-            
-            # Debug: Check if we can still communicate with the app
-            try:
-                connection_test = self.get_altdriver().get_current_scene()
-                print(f"DEBUG: App still responsive, scene: {connection_test}")
-            except Exception as e:
-                print(f"DEBUG: App may have crashed or lost connection: {e}")
-                raise SystemExit("App connection lost during login attempt")
-            
-            # Debug: Try to find any buttons to see what's available
-            try:
-                all_objects = self.get_altdriver().get_all_elements()
-                button_objects = [obj for obj in all_objects if 'btn' in obj.name.lower() or 'button' in obj.name.lower()]
-                print(f"DEBUG: Found button-like objects: {[obj.name for obj in button_objects]}")
-            except Exception as e:
-                print(f"DEBUG: Could not get all objects: {e}")
-            
-            # Check for login button
-            login_button = self.get_altdriver().find_object(By.NAME, "LoginBtn")
-            print("Found login button - performing login")
-
-            # Login
-            launch_browser()
-            bring_sample_app_to_foreground()
-            login_button.tap()
-            login()
-            bring_sample_app_to_foreground()
-
-            # Wait for authenticated screen
-            self.get_altdriver().wait_for_current_scene_to_be("AuthenticatedScene")
-            stop_browser()
-            print("[SUCCESS] Login successful")
-            
-        except Exception as err:
-            stop_browser()
-            raise SystemExit(f"Login failed: {err}")
+                print(f"Login attempt {attempt + 1}/2 - current scene: {current_scene}")
+
+                time.sleep(3)
+
+                login_button = self.get_altdriver().find_object(By.NAME, "LoginBtn")
+                print("Found login button - performing login")
+
+                launch_browser()
+                bring_sample_app_to_foreground()
+                login_button.tap()
+                login()
+                bring_sample_app_to_foreground()
+
+                self.get_altdriver().wait_for_current_scene_to_be("AuthenticatedScene", timeout=30)
+                stop_browser()
+                print("[SUCCESS] Login successful")
+                return
+
+            except Exception as err:
+                stop_browser()
+                if attempt == 0:
+                    print(f"Login attempt 1 failed: {err}")
+                    print("Retrying login...")
+                    time.sleep(5)
+                    bring_sample_app_to_foreground()
+                else:
+                    raise SystemExit(f"Login failed after 2 attempts: {err}")
 
     def _logout_and_login(self):
         """Handle logout and then login when app starts authenticated"""

sample/Tests/test/test_windows_helpers.py

@@ -538,25 +538,45 @@ def login():
     time.sleep(3)
 
     try:
-        # Check what's actually on the page
         buttons = driver.find_elements(By.TAG_NAME, "button")
         print(f"Found {len(buttons)} buttons on page:")
-        for i, btn in enumerate(buttons[:5]):  # Show first 5 buttons
+        for i, btn in enumerate(buttons[:10]):
             try:
                 text = btn.text.strip()
                 if text:
                     print(f"  Button {i}: '{text}'")
             except:
                 pass
-        
-        # Wait for the deep link dialog to appear and click the button
-        # Use more specific selector to avoid clicking "Restore" button
+
         product_name = os.getenv("UNITY_APP_NAME", get_product_name())
-        deep_link_button = wait.until(EC.element_to_be_clickable((By.XPATH, f"//button[text()='Open {product_name}.cmd']")))
-        deep_link_button.click()
-        print("Clicked deep link permission dialog - Unity should receive redirect")
+        deep_link_selectors = [
+            f"//button[contains(text(),'Open {product_name}')]",
+            "//button[contains(text(),'Open')]",
+            "//button[contains(text(),'Allow')]",
+            "//a[contains(text(),'Open')]",
+        ]
+
+        clicked = False
+        for selector in deep_link_selectors:
+            try:
+                deep_link_button = WebDriverWait(driver, 5).until(
+                    EC.element_to_be_clickable((By.XPATH, selector)))
+                btn_text = deep_link_button.text.strip()
+                deep_link_button.click()
+                print(f"Clicked deep link button '{btn_text}' with selector: {selector}")
+                clicked = True
+                break
+            except:
+                continue
+
+        if not clicked:
+            print("No deep link button found with any selector - checking if redirect happened automatically")
+            current_url = driver.current_url
+            print(f"Current URL: {current_url}")
+            if 'checking' in current_url or 'callback' in current_url:
+                print("Still on checking page - deep link may not have fired")
     except Exception as e:
-        print(f"Deep link dialog not found or failed to click: {e}")
+        print(f"Deep link dialog handling error: {e}")
         print("This may cause the test to timeout waiting for scene change")
 
     # Keep browser alive for Unity deep link redirect