further test optimizations

Author: philimon-reset

SELECTOR_INFO.md

@@ -544,12 +544,19 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: cc-saved-options
-Selector Data: "option[data-l10n-id='credit-card-label-number-name-expiration-2']"
+Selector Data: "credit-cards"
 Description: The "Add card" modal, containing 4 fields
 Location: Inside the "Add card" form in the Saved payment methods section on the about:preferences#privacy page
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: address-saved-options
+Selector Data: "addresses"
+Description: gets the selector element for the saved addresses options
+Location: Inside the Saved addresses methods section on the about:preferences#privacy page
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: panel-popup-button
 Selector Data: "button[data-l10n-id='{name}']"
 Description: Element for a button by label
@@ -1453,9 +1460,9 @@ Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
 Selector Name: cc-saved-options
-Selector Data: "option[data-l10n-id='credit-card-label-number-name-expiration-2']"
-Description: The actually "Add card" modal, containing 4 fields
-Location: Inside the "Add card" form in the Saved payment methods section on the about:preferences#privacy page
+Selector Data: "credit-cards"
+Description: gets the selector element for the saved cc options
+Location: Inside the Saved payment methods section on the about:preferences#privacy page
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -31,9 +31,11 @@ def test_verify_new_address_is_added(
     # generate fake data for region
     address_autofill_data = util.fake_autofill_data(region)
 
-    # open saved addresses and add entry
+    # open saved addresses
     about_prefs_privacy.open()
-    about_prefs_privacy.get_saved_addresses_popup().click()
+    about_prefs_privacy.open_and_switch_to_saved_addresses_popup()
+    # add new entry to saved addresses
+    about_prefs_privacy.click_add_on_dialog_element()
     about_prefs_privacy.add_entry_to_saved_addresses(address_autofill_data)
     about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -32,7 +32,7 @@ def test_create_new_cc_profile(
 
     # Add a new CC profile
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
-    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs_privacy.fill_and_save_cc_panel_information(credit_card_sample_data)
 
     # Get the saved CC data
     cc_profiles = about_prefs.get_all_saved_cc_profiles()

l10n_CM/Unified/test_demo_cc_autofill_from_dropdown.py

@@ -27,7 +27,7 @@ def test_cc_autofill_from_dropdown(
 
     # Create and save fake credit card data
     credit_card_data = util.fake_credit_card_data()
-    credit_card_fill_obj.fill_credit_card_info(credit_card_data)
+    credit_card_fill_obj.fill_and_submit_credit_card_info(credit_card_data)
     autofill_popup.click_doorhanger_button("save")
 
     # Autocomplete and clear all fields

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -31,7 +31,7 @@ def test_cc_clear_form(
 
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
-    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs_privacy.fill_and_save_cc_panel_information(credit_card_sample_data)
 
     # Open credit card form page, clear form and verify all fields are empty
     credit_card_fill_obj.open()

l10n_CM/Unified/test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py

@@ -28,7 +28,7 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
 
     # Fill data
     credit_card_sample_data = util.fake_credit_card_data(region)
-    credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
+    credit_card_fill_obj.fill_and_submit_credit_card_info(credit_card_sample_data)
 
     # The "Save credit card?" doorhanger is displayed
     assert autofill_popup.element_visible("doorhanger-save-button"), (

l10n_CM/Unified/test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py

@@ -26,7 +26,7 @@ def test_cc_check_door_hanger_is_displayed(
 
     # Fill data
     credit_card_sample_data = util.fake_credit_card_data(region)
-    credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
+    credit_card_fill_obj.fill_and_submit_credit_card_info(credit_card_sample_data)
 
     # Check if an element from the door hanger is visible
     autofill_popup.element_visible("doorhanger-save-button")

l10n_CM/Unified/test_demo_cc_dropdown_presence.py

@@ -30,7 +30,7 @@ def test_dropdown_presence_credit_card(
 
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
-    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs_privacy.fill_and_save_cc_panel_information(credit_card_sample_data)
 
     # Open credit card form page
     credit_card_fill_obj.open()

l10n_CM/Unified/test_demo_cc_hover_verify_cc.py

@@ -39,7 +39,7 @@ def test_cc_preview(
     about_prefs_privacy.click_on(
         "panel-popup-button", labels=["autofill-manage-add-button"]
     )
-    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs_privacy.fill_and_save_cc_panel_information(credit_card_sample_data)
 
     # Open the credit card fill form
     credit_card_fill_obj.open()

l10n_CM/Unified/test_demo_cc_yellow_highlight.py

@@ -29,7 +29,7 @@ def test_cc_yellow_highlight(
     about_prefs_privacy.open_and_switch_to_saved_payments_popup()
     credit_card_sample_data = util.fake_credit_card_data(region)
     about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
-    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs.fill_and_save_cc_panel_information(credit_card_sample_data)
 
     # Open the credit card fill form and trigger the autofill option
     credit_card_fill_obj.open()