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

Author: ben-c-at-moz

modules/data/about_addons.components.json

@@ -39,5 +39,17 @@
         "selectorData": "button[data-l10n-id='install-theme-button']",
         "strategy": "css",
         "groups": []
+    },
+
+    "languages-addon-list": {
+        "selectorData": "locale-enabled-section",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "languages-addon-list-card": {
+        "selectorData": "addon-card",
+        "strategy": "tag",
+        "groups": []
     }
 }

modules/data/about_prefs.components.json

@@ -250,5 +250,11 @@
         "selectorData": "contentBlockingFingerprintingProtectionCheckbox",
         "strategy": "id",
         "groups": []
+    },
+
+    "language-dropdown": {
+        "selectorData": "primaryBrowserLocale",
+        "strategy": "id",
+        "groups": []
     }
 }

modules/data/amo_languages.components.json

@@ -0,0 +1,39 @@
+{
+    "language-addons-title": {
+        "selectorData": "Card-header-text",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "language-addons-row": {
+        "selectorData": "tr[class='{name}']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "language-addons-row-link": {
+        "selectorData": "a",
+        "strategy": "tag",
+        "groups": []
+    },
+
+    "language-addons-subpage-add-to-firefox": {
+        "selectorData": "div[class='AMInstallButton AMInstallButton--noDownloadLink']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "language-install-popup-add": {
+        "selectorData": "button[class='popup-notification-primary-button primary footer-button']",
+        "strategy": "css",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
+    "language-addons-subpage-header": {
+        "selectorData": "AddonTitle",
+        "strategy": "class",
+        "groups": []
+    }
+}

modules/page_object_about_prefs.py

@@ -46,7 +46,7 @@ def __init__(self, page, **kwargs):
         def loaded(self):
             return self.root if EC.element_to_be_clickable(self.root) else False
 
-        def select_option(self, option_name: str):
+        def select_option(self, option_name: str, double_click=False):
             """Select an option in the dropdown. Does not return self."""
             if not self.dropmarker.get_attribute("open") == "true":
                 self.root.click()
@@ -58,8 +58,13 @@ def select_option(self, option_name: str):
             if len(matching_menuitems) == 0:
                 return False
             elif len(matching_menuitems) == 1:
-                matching_menuitems[0].click()
-                self.wait.until(EC.element_to_be_selected(matching_menuitems[0]))
+                if double_click:
+                    AboutPrefs(self.driver).double_click(
+                        reference=matching_menuitems[0]
+                    )
+                else:
+                    matching_menuitems[0].click()
+                    self.wait.until(EC.element_to_be_selected(matching_menuitems[0]))
                 return self
             else:
                 raise ValueError("More than one menu item matched search string")

modules/page_object_addons_mozilla_org.py

@@ -24,3 +24,35 @@ def install_recommended_theme(self) -> BasePage:
             self.driver.find_element(By.CSS_SELECTOR, "button[label='Add']").click()
             self.driver.find_element(By.CSS_SELECTOR, "button[label='Okay']").click()
         return self
+
+
+class AmoLanguages(BasePage):
+    """
+    POM for AMO Languages
+    """
+
+    URL_TEMPLATE = "https://addons.mozilla.org/en-US/firefox/language-tools/"
+
+    def wait_for_language_page_to_load(self) -> BasePage:
+        """
+        Waits until the language page is loaded
+        """
+        self.custom_wait(timeout=20).until(
+            lambda _: self.get_element("language-addons-title") is not None
+        )
+        return self
+
+    def find_language_row_and_navigate(self, language_label: str) -> BasePage:
+        """
+        Finds the row that corresponds with the language_label and clicks into it
+        """
+        language_row = self.get_element("language-addons-row", labels=[language_label])
+        self.get_element(
+            "language-addons-row-link", parent_element=language_row
+        ).click()
+
+        # ensuring the subpage of the language is loaded
+        self.custom_wait(timeout=20).until(
+            lambda _: self.get_element("language-addons-subpage-header") is not None
+        )
+        return self

tests/address_bar_and_search/test_sap_google_adclick.py

@@ -1,6 +1,5 @@
 import time
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation

tests/language_packs/test_language_pack_install_addons.py

@@ -0,0 +1,71 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.page_object import AboutAddons, AboutPrefs, AmoLanguages
+
+LANGUAGES = [
+    (
+        "Italiano",
+        "LanguageTools-table-row LanguageTools-lang-it",
+        "it",
+        "Imposta alternative…",
+    )
+]
+
+
+@pytest.mark.parametrize(
+    "drop_down_name, language_label, shortform, localized_text", LANGUAGES
+)
+def test_language_pack_install_from_addons(
+    driver: Firefox,
+    drop_down_name: str,
+    language_label: str,
+    shortform: str,
+    localized_text: str,
+):
+    """
+    C1549408: verify that installing a language pack from about:addons will correctly change the locale
+    """
+    # instantiate objects
+    amo_languages = AmoLanguages(driver).open()
+
+    # ensuring the page was loaded
+    amo_languages.wait_for_language_page_to_load()
+
+    # grab the appropriate link and wait until the page is loaded
+    amo_languages.find_language_row_and_navigate(language_label)
+    amo_languages.get_element("language-addons-subpage-add-to-firefox").click()
+
+    with driver.context(driver.CONTEXT_CHROME):
+        # click one for "Add"
+        amo_languages.get_element("language-install-popup-add").click()
+        # click second time for "Okay", the button is not cached which allows for two different buttons to be different
+        amo_languages.get_element("language-install-popup-add").click()
+
+    # ensure that the about:addons has the language listed
+    about_addons = AboutAddons(driver).open()
+    about_addons.choose_sidebar_option("locale")
+    addon_list_parent = about_addons.get_element("languages-addon-list")
+    addon_language_cards = about_addons.get_element(
+        "languages-addon-list-card", multiple=True, parent_element=addon_list_parent
+    )
+
+    # making sure that 1 language was installed
+    assert len(addon_language_cards) == 1
+
+    # perform language changing and assertions in about_prefs
+    about_prefs = AboutPrefs(driver, category="general").open()
+    language_dropdown = about_prefs.get_element("language-dropdown")
+    dropdown = about_prefs.Dropdown(page=about_prefs, root=language_dropdown)
+    dropdown.select_option(drop_down_name, double_click=True)
+
+    about_prefs.custom_wait(timeout=15).until(
+        lambda _: about_prefs.get_element("html-root").get_attribute("lang")
+        == shortform
+    )
+    assert (
+        about_prefs.get_element("language-set-alternatives-button").get_attribute(
+            "label"
+        )
+        == localized_text
+    )

tests/language_packs/test_language_pack_install_preferences.py

@@ -1,10 +1,16 @@
+import pytest
 from selenium.webdriver import Firefox
 
 from modules.page_object import AboutPrefs
 from modules.util import BrowserActions
 
+LANGUAGES = [("it", "Imposta alternative…")]
 
-def test_language_pack_install_about_preferences(driver: Firefox):
+
+@pytest.mark.parametrize("shortform, localized_text", LANGUAGES)
+def test_language_pack_install_about_preferences(
+    driver: Firefox, shortform: str, localized_text: str
+):
     """
     C1549409: language packs can be installed from about:preferences and firefox is correctly localized
     """
@@ -49,5 +55,8 @@ def test_language_pack_install_about_preferences(driver: Firefox):
 
     # final asserts to ensure language is set
     ba.switch_to_content_context()
-    assert about_prefs.get_element("html-root").get_attribute("lang") == "it"
-    assert alternative_button.get_attribute("label") == "Imposta alternative…"
+    about_prefs.custom_wait(timeout=15).until(
+        lambda _: about_prefs.get_element("html-root").get_attribute("lang")
+        == shortform
+    )
+    assert alternative_button.get_attribute("label") == localized_text