resolve conflicts

Author: Hani Yacoub

SELECTOR_INFO.md

@@ -1367,6 +1367,20 @@ Description: Save address doorhanger phone section
 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
+```
 #### context_menu
 ```
 Selector Name: context-menu-search-selected-text

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,63 @@
+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 Utilities, BrowserActions
+
+
+@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!"

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_email_phone_captured_in_doorhanger_and_stored"
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py"
     ]
 }

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_email_phone_captured_in_doorhanger_and_stored"
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py"
     ]
 }

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_email_phone_captured_in_doorhanger_and_stored"
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py"
     ]
 }

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_email_phone_captured_in_doorhanger_and_stored"
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py"
     ]
 }

modules/data/autofill_popup.components.json

@@ -95,6 +95,18 @@
         "selectorData": "div.address-save-update-row-container:nth-of-type(2) div p:nth-of-type(2) span",
         "strategy": "css",
         "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": []
     }
 }