test: fix windows login tab

Author: nattb8

sample/Tests/test/test_mac.py

@@ -96,11 +96,6 @@ def login(cls):
         cls.seleniumdriver = webdriver.Chrome(options=chrome_options)
 
         print("Open a window on Chrome")
-<<<<<<< HEAD
-
-        wait = WebDriverWait(cls.seleniumdriver, 60)
-=======
->>>>>>> ddbff678 (test: mac pkce ui test)
 
         wait = WebDriverWait(cls.seleniumdriver, 60)
 
@@ -127,17 +122,8 @@ def login(cls):
         print("Entering OTP...")
         otp_field.send_keys(code)
 
-<<<<<<< HEAD
-        # Wait for success page and confirm
-        success = WebDriverWait(cls.seleniumdriver, 60).until(EC.presence_of_element_located((SeleniumBy.CSS_SELECTOR, 'h1[data-testid="device_success_title"]')))
-        print("Connected to Passport!")
-
-        time.sleep(5)
-        
-=======
         time.sleep(5)
 
->>>>>>> ddbff678 (test: mac pkce ui test)
         cls.seleniumdriver.quit()
 
     @classmethod
@@ -147,21 +133,10 @@ def logout(cls):
         bring_sample_app_to_foreground()
         cls.altdriver.find_object(By.NAME, "LogoutBtn").tap()
         time.sleep(5)
-<<<<<<< HEAD
-        bring_sample_app_to_foreground()
-=======
->>>>>>> ddbff678 (test: mac pkce ui test)
         cls.altdriver.wait_for_current_scene_to_be("UnauthenticatedScene")
         time.sleep(2)
         cls.stop_browser()
         print("Logged out")
-<<<<<<< HEAD
-
-    def test_1_device_code_login(self):
-        # Select use device code auth
-        self.altdriver.find_object(By.NAME, "DeviceCodeAuth").tap()
-=======
->>>>>>> ddbff678 (test: mac pkce ui test)
 
     def test_1_login(self):
         # Wait for unauthenticated screen
@@ -183,11 +158,7 @@ def test_1_login(self):
                 # Wait for authenticated screen
                 self.altdriver.wait_for_current_scene_to_be("AuthenticatedScene")
                 print("Logged in")
-<<<<<<< HEAD
-
-=======
 
->>>>>>> ddbff678 (test: mac pkce ui test)
                 self.stop_browser()
                 return
             except Exception as err:

sample/Tests/test/test_windows_helpers.py

@@ -56,15 +56,23 @@ def login():
 
     # Get all window handles
     all_windows = driver.window_handles
+<<<<<<< HEAD
 
     print(f"Found {len(all_windows)} new windows to check: {all_windows}")
 
     # Find the window with the expected element
+=======
+    
+    print(f"Found {len(all_windows)} new windows to check: {all_windows}")
+    
+    # Find the window with email input
+>>>>>>> 8cb65d08 (test: fix windows login tab)
     target_window = None
     for window in all_windows:
         try:
             print(f"Checking window: {window}")
             driver.switch_to.window(window)
+<<<<<<< HEAD
 
             if use_pkce:
                 driver.find_element(By.ID, ':r1:')
@@ -81,11 +89,25 @@ def login():
             print(f"{expected_element} not found in window: {window}, trying next...")
             continue
 
+=======
+            driver.find_element(By.ID, ':r1:')
+            target_window = window
+            print(f"Found email input in window: {window}")
+            break
+        except:
+            print(f"Email input not found in window: {window}, trying next...")
+            continue
+    
+>>>>>>> 8cb65d08 (test: fix windows login tab)
     if not target_window:
         print("Could not find email input field in any window!")
         driver.quit()
         return
+<<<<<<< HEAD
 
+=======
+    
+>>>>>>> 8cb65d08 (test: fix windows login tab)
     print("Switch to the target window")
     driver.switch_to.window(target_window)