Merge branch 'main' into as/tls-v1.2-protocol

Author: ben-c-at-moz

.gitignore

@@ -2,6 +2,8 @@
 results.txt
 err_log.txt
 **/report.html
+**/result.xml
+**/report.xml
 assets/
 html_dump/
 /Test Results - .html

Pipfile

@@ -16,6 +16,7 @@ pypom = "*"
 jsonpath-ng = "*"
 pillow = "*"
 pyfxa = "*"
+pytest-rerunfailures = "*"
 
 [dev-packages]
 werkzeug = "*"

README.md

@@ -1,4 +1,6 @@
-## fx-desktop-qa-automation
+## Project STARfox
+**S**moke **T**est **A**utomation **R**epository for Fire*fox* Desktop
+
 A Python Selenium based set of tests for smoke testing of Firefox, including Fx incident smoke testing.
 
 ### Build under test

ci_pyproject.toml

@@ -16,7 +16,7 @@ markers = [
 testpaths = [
     "tests"
 ]
-addopts = "-vs --ci -m 'not incident and not unstable' --html=artifacts/report.html"
+addopts = "-vs --ci --reruns 2 --reruns-delay 1 -m 'not incident and not unstable' --html=artifacts/report.html"
 
 [tool.ruff]
 target-version = "py310"

modules/browser_object.py

@@ -1,6 +1,7 @@
 from modules.browser_object_about_prefs_cc_popup import *
 from modules.browser_object_autofill_popup import *
 from modules.browser_object_credit_card_popup import *
+from modules.browser_object_devtools import *
 from modules.browser_object_find_toolbar import *
 from modules.browser_object_image_context_menu import *
 from modules.browser_object_navigation import *

modules/browser_object_autofill_popup.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support import expected_conditions as EC
 
@@ -18,6 +20,14 @@ def press_doorhanger_save(self):
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.get_element("doorhanger-save-button").click()
 
+    def verify_autofill_displayed(self):
+        """Confirms that autofill popup has loaded"""
+        self.element_clickable("autofill-panel")
+
+    def verify_element_displayed(self, reference: Union[str, tuple, WebElement]):
+        """Confirms that an element exists in popup"""
+        self.element_clickable(reference)
+
     def verify_no_popup_panel(self):
         """
         Verifies that the autofill popup does NOT appear.
@@ -53,6 +63,26 @@ def get_primary_value(self, element):
             ac_value = element.get_attribute("ac-value")
             return ac_value
 
+    def click_address(self) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("select-form-option").click()
+        return self
+
+    def click_clear_address(self) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("clear-address").click()
+        return self
+
+    def click_credit_card(self) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("select-form-option").click()
+        return self
+
+    def click_clear_credit_card(self) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("clear-creditcard").click()
+        return self
+
     def press_doorhanger_dropdown(self):
         """
         Presses the button beside Not now which toggles the dropdown menu in the doorhanger

modules/browser_object_devtools.py

@@ -0,0 +1,11 @@
+from modules.page_base import BasePage
+
+
+class Devtools(BasePage):
+    """BOM for the DevTools panel"""
+
+    URL_TEMPLATE = ""
+
+    def check_opened(self) -> BasePage:
+        self.wait_for_page_to_load()
+        return self

modules/browser_object_panel_ui.py

@@ -1,4 +1,5 @@
 from pypom import Region
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
 from selenium.webdriver.support import expected_conditions as EC
 
 from modules.page_base import BasePage
@@ -106,6 +107,15 @@ def confirm_sync_in_progress(self) -> BasePage:
         """
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.click_sync_sign_in_button()
+            try:
+                self.instawait.until(
+                    EC.text_to_be_present_in_element(
+                        self.get_selector("fxa-sync-label"), "Sync"
+                    )
+                )
+            except (NoSuchElementException, TimeoutException):
+                self.get_element("panel-ui-button").click()
+                self.click_sync_sign_in_button()
             self.custom_wait(timeout=30, poll_frequency=0.5).until(
                 EC.text_to_be_present_in_element(
                     self.get_selector("fxa-sync-label"), "Syncing"

modules/data/about_newtab.components.json

@@ -39,7 +39,7 @@
     },
 
     "sponsored-site-card-menu-button": {
-        "selectorData": "button[class=\"context-menu-button icon\"]",
+        "selectorData": "button[class='context-menu-button icon']",
         "strategy": "css",
         "groups": [
             "doNotCache"

modules/data/address_fill.components.json

@@ -1,26 +1,13 @@
 {
     "form-field": {
-        "selectorData": "input[autocomplete=\"{name}\"]",
+        "selectorData": "input[autocomplete='{name}']",
         "strategy": "css",
         "groups": []
     },
 
     "submit-button": {
-        "selectorData": "input[type=\"{name}\"]",
+        "selectorData": "input[type='{name}']",
         "strategy": "css",
         "groups": []
-    },
-
-    "clear-address": {
-        "selectorData": ".autocomplete-richlistbox .autocomplete-richlistitem[ac-value='Clear Autofill Form']",
-        "strategy":"css",
-        "groups": []
-    },
-
-    "select-address": {
-        "selectorData": ".autocomplete-richlistbox .autocomplete-richlistitem",
-        "strategy":"css",
-        "groups": []
     }
-
-}
+}