Merge main

Hani Yacoub · Hani Yacoub · commit 50699614149c · 2025-02-13T16:20:42.000+02:00
diff --git a/SELECTOR_INFO.md b/SELECTOR_INFO.md
@@ -1354,6 +1354,20 @@ Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: address-doorhanger-name
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span"
+Description: Save address doorhanger name section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-org
+Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(2) span"
+Description: Save address doorhanger organization section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: address-doorhanger-street
 Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(3) span"
 Description: Save address doorhanger street address section
diff --git a/l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py b/l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py
@@ -0,0 +1,64 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_about_pages import AboutConfig
+from modules.page_object_autofill import AddressFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888701"
+
+
+def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
+    driver: Firefox, region: str
+):
+    """
+    C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
+    """
+    # instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+    about_config = AboutConfig(driver)
+    browser_action_obj = BrowserActions(driver)
+
+    # Change pref value of region
+    about_config.change_config_value("browser.search.region", region)
+
+    # create fake data and fill it in
+    address_autofill.open()
+    address_autofill_data = util.fake_autofill_data(region)
+    address_autofill.save_information_basic(address_autofill_data)
+
+    # The "Save address?" doorhanger is displayed
+    address_autofill_popup.element_visible("address-save-doorhanger")
+
+    # containing name field
+    expected_name = address_autofill_data.name
+    address_autofill_popup.element_has_text("address-doorhanger-name", expected_name)
+
+    # containing org field
+    expected_org = address_autofill_data.organization
+    address_autofill_popup.element_has_text("address-doorhanger-org", expected_org)
+
+    # Click the "Save" button
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Navigate to about:preferences#privacy => "Autofill" section
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    iframe = about_prefs.get_save_addresses_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
+    elements = about_prefs.get_elements("saved-addresses-values")
+    expected_values = [expected_name, expected_org]
+    found_name_org = any(
+        all(value in element.text for value in expected_values) for element in elements
+    )
+    assert (
+        found_name_org
+    ), "Name or organization were not found in any of the address entries!"
diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json
@@ -4,6 +4,7 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }
diff --git a/l10n_CM/region/DE.json b/l10n_CM/region/DE.json
@@ -4,6 +4,7 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }
diff --git a/l10n_CM/region/FR.json b/l10n_CM/region/FR.json
@@ -4,6 +4,7 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }
diff --git a/l10n_CM/region/US.json b/l10n_CM/region/US.json
@@ -4,6 +4,7 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }
diff --git a/modules/browser_object_navigation.py b/modules/browser_object_navigation.py
@@ -22,6 +22,14 @@ class Navigation(BasePage):
         "History": "^",
         "Actions": ">",
     }
+    VALID_SEARCH_MODES = {
+        "Google",
+        "eBay",
+        "Amazon.com",
+        "Bing",
+        "DuckDuckGo",
+        "Wikipedia (en)",
+    }
 
     def expect_in_content(self, condition) -> BasePage:
         """Like BasePage.expect, but guarantee we're looking at CONTEXT_CONTENT"""
@@ -171,6 +179,36 @@ def click_in_awesome_bar(self) -> BasePage:
         self.awesome_bar.click()
         return self
 
+    def click_search_mode_switcher(self) -> BasePage:
+        """
+        click search mode switcher
+        """
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.search_mode_switcher = self.get_element("searchmode-switcher")
+            self.search_mode_switcher.click()
+        return self
+
+    def set_search_mode(self, search_mode: str) -> BasePage:
+        """
+        set new search location if search_mode in VALID_SEARCH_MODES
+
+        Parameter:
+            search_mode (str): search mode to be selected
+
+        Raises:
+            StopIteration: if a valid search mode is not found in the list of valid elements.
+        """
+        # check if search_mode is valid, otherwise raise error.
+        if search_mode not in self.VALID_SEARCH_MODES:
+            raise ValueError("search location is not valid.")
+        # switch to chrome context
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            # get list of all valid search modes and filter by label
+            self.get_element(
+                "search-mode-switcher-option", labels=[search_mode]
+            ).click()
+            return self
+
     def context_click_in_awesome_bar(self) -> BasePage:
         self.set_awesome_bar()
         actions = ActionChains(self.driver)
diff --git a/modules/data/autofill_popup.components.json b/modules/data/autofill_popup.components.json
@@ -85,6 +85,18 @@
         "groups": []
     },
 
+    "address-doorhanger-name": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-org": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(2) span",
+        "strategy": "css",
+        "groups": []
+    },
+
     "address-doorhanger-street": {
         "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:nth-of-type(3) span",
         "strategy": "css",
diff --git a/modules/data/navigation.components.json b/modules/data/navigation.components.json
@@ -322,7 +322,6 @@
         "strategy": "id",
         "groups": []
     },
-
     "bookmarks-type-dropdown": {
         "selectorData": "editBMPanel_folderMenuList",
         "strategy": "id",
@@ -569,7 +568,6 @@
     "searchmode-switcher-settings": {
         "selectorData": "searchmode-switcher-popup-search-settings-button",
         "strategy": "id",
-
         "groups": []
     },
 
diff --git a/modules/page_object_prefs.py b/modules/page_object_prefs.py
@@ -394,11 +394,12 @@ def click_popup_panel_button(self, field: str) -> BasePage:
             self.get_element("panel-popup-button", labels=[field]).click()
         return self
 
-    def select_https_only_setting(self, option_id: HttpsOnlyStatus) -> BasePage:
+    def select_https_only_setting(self, option_id: "HttpsOnlyStatus") -> BasePage:
         """
         Click the HTTPS Only option given
         """
         self.find_in_settings("HTTPS")
+        self.element_clickable(option_id)
         self.click_on(option_id)
         self.element_attribute_contains(option_id, "checked", "")
         return self
diff --git a/tests/address_bar_and_search/test_search_engine_selector.py b/tests/address_bar_and_search/test_search_engine_selector.py
@@ -0,0 +1,32 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support import expected_conditions as EC
+
+from modules.browser_object import Navigation
+
+
+@pytest.fixture()
+def test_case():
+    return "1365151"
+
+
+@pytest.mark.parametrize(
+    "search_mode",
+    ["Google", "eBay", "Bing", "DuckDuckGo", "Wikipedia (en)", "Amazon.com"],
+)
+def test_search_engine_selector_and_validator(driver: Firefox, search_mode: str):
+    """
+    Select Appropriate search engine and go to site, asserting that the correct search engine was used.
+
+    Parameters:
+        driver (FireFox): webdriver used for communicating with the browser.
+        search_mode (str): search parameter selected from the awesome bar.
+    """
+    nav = Navigation(driver)
+    url_element_search_mode = search_mode.split()[0].lower()
+    nav.click_search_mode_switcher()
+    nav.set_search_mode(search_mode)
+    nav.search("soccer")
+    nav.expect_in_content(EC.url_contains(url_element_search_mode))
+    assert url_element_search_mode in driver.current_url
+    nav.clear_awesome_bar()
diff --git a/tests/scrolling_panning_zooming/test_zoom_text_only.py b/tests/scrolling_panning_zooming/test_zoom_text_only.py
@@ -41,6 +41,7 @@ def temp_selectors():
 
 
 @pytest.mark.ci
+@pytest.mark.unstable
 def test_zoom_text_only_from_settings(driver: Firefox, temp_selectors):
     """
     C545733.1: Verify that ticking the zoom text only box would only affect the scale of text.
@@ -74,6 +75,7 @@ def test_zoom_text_only_from_settings(driver: Firefox, temp_selectors):
     about_prefs.click_on("zoom-text-only")
 
 
+@pytest.mark.unstable
 def test_zoom_text_only_after_restart(driver: Firefox, temp_selectors):
     """
     C545733.2: Verify that the zoom text only option works after restart
diff --git a/tests/security_and_privacy/conftest.py b/tests/security_and_privacy/conftest.py
@@ -14,6 +14,6 @@ def add_prefs():
 @pytest.fixture()
 def set_prefs(add_prefs: dict):
     """Set prefs"""
-    prefs = []
+    prefs = [("browser.urlbar.scotchBonnet.enableOverride", True)]
     prefs.extend(add_prefs)
     return prefs

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",`
`5`	`5`	`"test_demo_cc_add_new_credit_card.py",`
`6`	`6`	`"test_demo_ad_doorhanger_shown_on_valid_address_submission.py",`
	`7`	`+ "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",`
`7`	`8`	`"test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"`
`8`	`9`	`]`
`9`	`10`	`}`