Merge main

Author: Hani Yacoub

Pipfile

@@ -16,7 +16,7 @@ pypom = "2.2.4"
 taskcluster-taskgraph = "==9.0.0"
 jsonpath-ng = "1.6.1"
 pillow = "<10.5"
-pyfxa = "0.7.0"
+pyfxa = "0.8.1"
 ruff = "0.9.6"
 pytest-rerunfailures = "14.0"
 slack-sdk = "3.31.0"

SELECTOR_INFO.md

@@ -2042,6 +2042,34 @@ Location: In the FxA signin page flow
 Path to .json: modules/data/fxa_home.components.json
 ```
 ```
+Selector Name: do-it-later-button
+Selector Data: "inline_recovery_key_setup_create_do_it_later"
+Description: Coninute fxa account creation flow
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: login-password-input
+Selector Data: "choice-pair-not-now"
+Description: Dont pair with phone now
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: signed-in-status
+Selector Data: "div[role='status']"
+Description: Sign in status
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
+Selector Name: manage-sync-button
+Selector Data: "signup_confirmed_sync_manage_sync_button"
+Description: sign up and sync confirmation
+Location: In the FxA signin page flow
+Path to .json: modules/data/fxa_home.components.json
+```
+```
 Selector Name: signin-otp-input
 Selector Data: "[data-testid='signin-token-code-input-field']"
 Description: The FxAccount One Time Password entry field

choose_l10n_ci_set.py

@@ -89,7 +89,8 @@ def select_l10n_mappings(beta_version):
     beta_split = (beta_version % 3) + 1
     if os.path.exists(f"l10n_CM/beta_run_splits/l10n_split_{beta_split}.json"):
         with open(f"l10n_CM/beta_run_splits/l10n_split_{beta_split}.json", "r") as f:
-            return json.load(f)
+            current_split_mappings = {k: set(v) for k, v in json.load(f).items()}
+            return current_split_mappings
     else:
         return valid_l10n_mappings()
 

l10n_CM/README.md

@@ -31,6 +31,8 @@ The harness relies on several configuration files:
     ]
 }
 ```
+**NOTE**: If both the address and credit card tests are skipped for the site, do not add it to the region files.
+
 - **Site Test Configuration**: Located in `constants/{site_name}.json` or `constants/{site_name}/{region}.json`, defining site-specific test configurations and skipped tests. Here we map the attributes for either `AutofillAddressBase` or `CreditCardBase` to the corresponding selectors.
 
 ```aiignore

l10n_CM/constants/calvinklein/US/calvinklein_ad.json

@@ -10,9 +10,7 @@
     "email": "0c994dc2-4e0b-4734-8582-74ce9a1bff55",
     "telephone": "e1f86567-396f-473c-8666-47447f52d722"
   },
-
   "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
-  "skip": "True",
   "fields": [
     "5d2af5cb-8f6d-4fdc-8ae5-21c7e5e97a43",
     "82900c67-963c-40f8-b0ef-c986a2accc43",

modules/browser_object_panel_ui.py

@@ -71,6 +71,21 @@ def click_sync_sign_in_button(self) -> BasePage:
         self.click_on("fxa-sign-in")
         return self
 
+    def open_account_toolbar(self):
+        """
+        Open the FxA account toolbar.
+        """
+        self.click_on("sync-user-button")
+        return self
+
+    def click_finish_sign_in_button(self):
+        """
+        Click FxA finish sign in button.
+        """
+        self.open_account_toolbar()
+        self.click_on("fxa-finish-sign-in")
+        return self
+
     def log_out_fxa(self) -> BasePage:
         """
         Click FxA signout button.
@@ -89,6 +104,15 @@ def manage_fxa_account(self) -> BasePage:
             self.get_element("fxa-manage-account-button").click()
         return self
 
+    @BasePage.context_chrome
+    def manage_fxa_finish_sign_in(self):
+        """
+        Open the FxA management flow to finish sign in.
+        """
+        self.open_account_toolbar()
+        self.click_on("fxa-manage-account-button")
+        return self
+
     def confirm_sync_in_progress(self) -> BasePage:
         """
         Check that FxA Sync Label is set to "Syncing…"

modules/data/fxa_home.components.json

@@ -1,84 +1,91 @@
 {
-    "login-email-input": {
-        "selectorData": "input[type='email']",
-        "strategy": "css",
-        "groups": [
-            "requiredForPage"
-        ]
-
-    },
-
-    "submit-button": {
-        "selectorData": "button[type='submit']",
-        "strategy": "css",
-        "groups": [
-            "doNotCache"
-        ]
-    },
-
-    "signup-password-input": {
-        "selectorData": "[data-testid='new-password-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "signup-password-repeat-input": {
-        "selectorData": "[data-testid='verify-password-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "age-input": {
-        "selectorData": "[data-testid='age-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "card-header": {
-        "selectorData": "card-header",
-        "strategy": "class",
-        "groups": []
-    },
-
-    "signup-otp-input": {
-        "selectorData": "[data-testid='confirm-signup-code-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "signin-otp-input": {
-        "selectorData": "[data-testid='signin-token-code-input-field']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "otp-input": {
-        "selectorData": "input[inputmode='numeric']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "connected-heading": {
-        "selectorData": "fxa-connected-heading",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "continue-browsing-link": {
-        "selectorData": "cad-not-now",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "login-password-input": {
-        "selectorData": "input[type='password']",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "sign-in-button": {
-        "selectorData": "use-logged-in",
-        "strategy": "id",
-        "groups": []
-    }
+  "login-email-input": {
+    "selectorData": "input[name='email']",
+    "strategy": "css",
+    "groups": [
+      "requiredForPage"
+    ]
+  },
+  "submit-button": {
+    "selectorData": "button[type='submit']",
+    "strategy": "css",
+    "groups": [
+      "doNotCache"
+    ]
+  },
+  "signup-password-input": {
+    "selectorData": "[data-testid='new-password-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signup-password-repeat-input": {
+    "selectorData": "[data-testid='verify-password-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "age-input": {
+    "selectorData": "[data-testid='age-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "card-header": {
+    "selectorData": "card-header",
+    "strategy": "class",
+    "groups": []
+  },
+  "signup-otp-input": {
+    "selectorData": "[data-testid='confirm-signup-code-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signin-otp-input": {
+    "selectorData": "[data-testid='signin-token-code-input-field']",
+    "strategy": "css",
+    "groups": []
+  },
+  "otp-input": {
+    "selectorData": "input[inputmode='numeric']",
+    "strategy": "css",
+    "groups": []
+  },
+  "connected-heading": {
+    "selectorData": "fxa-connected-heading",
+    "strategy": "id",
+    "groups": []
+  },
+  "continue-browsing-link": {
+    "selectorData": "cad-not-now",
+    "strategy": "id",
+    "groups": []
+  },
+  "login-password-input": {
+    "selectorData": "input[type='password']",
+    "strategy": "css",
+    "groups": []
+  },
+  "signed-in-status": {
+    "selectorData": "div[role='status']",
+    "strategy": "css",
+    "groups": []
+  },
+  "manage-sync-button": {
+    "selectorData": "signup_confirmed_sync_manage_sync_button",
+    "strategy": "id",
+    "groups": []
+  },
+  "do-it-later-button": {
+    "selectorData": "inline_recovery_key_setup_create_do_it_later",
+    "strategy": "id",
+    "groups": []
+  },
+  "not-now-button": {
+    "selectorData": "choice-pair-not-now",
+    "strategy": "id",
+    "groups": []
+  },
+  "sign-in-button": {
+    "selectorData": "use-logged-in",
+    "strategy": "id",
+    "groups": []
+  }
 }

modules/data/panel_ui.components.json

@@ -38,6 +38,11 @@
         "strategy": "css",
         "groups": []
     },
+    "fxa-finish-sign-in": {
+        "selectorData": "appMenu-header-description",
+        "strategy": "id",
+        "groups": []
+    },
 
     "fxa-sync-label": {
         "selectorData": "syncnow-label",
@@ -57,6 +62,8 @@
         "groups": []
     },
 
+
+
     "customize-toolbar": {
         "selectorData": "overflowMenu-customize-button",
         "strategy": "id",

modules/page_base.py

@@ -11,7 +11,8 @@
 from typing import List, Union
 
 from pynput.keyboard import Controller, Key
-from pynput.mouse import Button, Controller as MouseController
+from pynput.mouse import Button
+from pynput.mouse import Controller as MouseController
 from pypom import Page
 from selenium.common import NoAlertPresentException
 from selenium.common.exceptions import (
@@ -454,6 +455,11 @@ def title_contains(self, url_part: str) -> Page:
         self.expect(EC.title_contains(url_part))
         return self
 
+    def title_is(self, url_part: str) -> Page:
+        """Expect helper: wait until driver URL is given text or timeout"""
+        self.expect(EC.title_is(url_part))
+        return self
+
     def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         """
         Given a part of a URL and a regex, wait for that substring to exist in
@@ -559,7 +565,9 @@ def triple_click(self, reference: Union[str, tuple, WebElement], labels=[]) -> P
         """Actions helper: perform triple-click on a given element"""
         return self.multi_click(3, reference, labels)
 
-    def control_click(self, reference: Union[str, tuple, WebElement], labels=[]) -> Page:
+    def control_click(
+        self, reference: Union[str, tuple, WebElement], labels=[]
+    ) -> Page:
         """Actions helper: perform control-click on given element"""
         element = self.fetch(reference, labels)
         if self.sys_platform() == "Darwin":
@@ -569,10 +577,9 @@ def control_click(self, reference: Union[str, tuple, WebElement], labels=[]) ->
         self.actions.key_down(mod_key).click(element).key_up(mod_key).perform()
         return self
 
-    def middle_click(self, reference: Union[str, tuple, WebElement], labels =[]):
-        """Perform a middle mouse click on desired element"""
-        with self.driver.context(self.driver.CONTEXT_CONTENT):
-            self.driver.maximize_window()
+    def middle_click(self, reference: Union[str, tuple, WebElement], labels=[]):
+        """Actions helper: Perform a middle mouse click on desired element"""
+        with self.driver.context(self.context_id):
             mouse = MouseController()
             element = self.fetch(reference, labels)
 
@@ -584,14 +591,24 @@ def middle_click(self, reference: Union[str, tuple, WebElement], labels =[]):
             outer_height = self.driver.execute_script("return window.outerHeight;")
             chrome_height = outer_height - inner_height
 
-            element_x = window_position['x'] + element_location['x'] + (element_size['width'] / 2)
-            element_y = window_position['y'] + element_location['y'] + (element_size['height'] / 2) + chrome_height
+            element_x = (
+                window_position["x"]
+                + element_location["x"]
+                + (element_size["width"] / 2)
+            )
+            element_y = (
+                window_position["y"]
+                + element_location["y"]
+                + (element_size["height"] / 2)
+                + chrome_height
+            )
             mouse.position = (element_x, element_y)
 
-            time.sleep(1)
+            # Need a short wait to ensure the mouse move completes, then middle click
+            time.sleep(0.5)
             mouse.click(Button.middle, 1)
         return self
-    
+
     def context_click(
         self, reference: Union[str, tuple, WebElement], labels=[]
     ) -> Page: