Add files that were reverted.

Author: vsangereanMOZ

modules/browser_object_panel_ui.py

@@ -39,14 +39,14 @@ def loaded(self):
             ]
             return all([EC.presence_of_element_located(el) for el in targeted])
 
+    @BasePage.context_chrome
     def open_panel_menu(self) -> BasePage:
         """
         Opens the PanelUi menu.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            panel_root = self.get_element("panel-ui-button")
-            panel_root.click()
-            self.menu = self.Menu(self, root=panel_root)
+        panel_root = self.get_element("panel-ui-button")
+        panel_root.click()
+        self.menu = self.Menu(self, root=panel_root)
         return self
 
     def select_panel_setting(self, name: str, *labels) -> BasePage:
@@ -181,13 +181,13 @@ def get_all_history(self) -> List[WebElement]:
             history_items = self.get_elements("bookmark-item")
             return history_items
 
+    @BasePage.context_chrome
     def redirect_to_about_logins_page(self) -> BasePage:
         """
         Opens the about:logins page by clicking the Password option in Hamburger Menu"
         """
         self.open_panel_menu()
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("password-button").click()
+        self.get_element("password-button").click()
         return self
 
     # Bookmarks section

modules/page_object_about_pages.py

@@ -12,6 +12,7 @@
 
 from modules.page_base import BasePage
 from modules.util import BrowserActions
+from selenium.webdriver import Firefox
 
 
 class AboutConfig(BasePage):
@@ -133,6 +134,10 @@ class AboutLogins(BasePage):
 
     URL_TEMPLATE = "about:logins"
 
+    def __init__(self, driver: Firefox, **kwargs):
+        super().__init__(driver, **kwargs)
+        self.ba = BrowserActions(self.driver)
+
     def click_add_login_button(self) -> Page:
         """Click the Add Login button"""
         self.get_element("create-login-button").click()
@@ -144,11 +149,10 @@ def create_new_login(self, form_info: dict) -> Page:
         Given a dict with keys that match the valid item types in the
         new login dialog, create a new login with those values through UI.
         """
-        ba = BrowserActions(self.driver)
         try:
             for item_type, value in form_info.items():
                 logging.info(f"Filling {item_type} with {value}")
-                ba.clear_and_fill(
+                self.ba.clear_and_fill(
                     self.get_element("login-item-type", labels=[item_type]), value
                 )
             logging.info("Clicking submit...")

modules/page_object_autofill.py

@@ -230,7 +230,7 @@ def verify_form_data(self, sample_data: CreditCardBase | AutofillAddressBase):
                 autofilled_field = self.get_element("form-field", labels=[field_name])
                 if autofilled_field.tag_name.lower() != "select":
                     autofilled_field_value = autofilled_field.get_attribute("value")
-                    # self.element_attribute_contains(
+                    # self.expect_element_attribute_contains(
                     #     "form-field", "value", expected_value, labels=[field_name]
                     # )
                 else:

modules/page_object_prefs.py

@@ -80,7 +80,7 @@ def set_alternative_language(self, lang_code: str) -> BasePage:
         self.get_element("language-option-by-code", labels=[lang_code]).click()
         select_language.click()
         self.get_element("language-settings-add-button").click()
-        self.element_attribute_contains(
+        self.expect_element_attribute_contains(
             "language-added-list", "last-selected", f"locale-{lang_code}"
         )
 
@@ -94,7 +94,7 @@ def select_https_only_setting(self, option_id: HttpsOnlyStatus) -> BasePage:
         self.find_in_settings("HTTPS")
         self.element_clickable(str(option_id))
         self.click_on(str(option_id))
-        self.element_attribute_contains(str(option_id), "checked", "")
+        self.expect_element_attribute_contains(str(option_id), "checked", "")
         return self
 
     def set_default_zoom_level(self, zoom_percentage: int) -> BasePage:

tests/bookmarks_and_history/test_opened_website_in_new_tab_present_in_toolbar_history.py

@@ -42,4 +42,4 @@ def test_the_website_opened_in_new_tab_is_present_in_history_menu(driver: Firefo
     panel_ui.open_history_menu()
 
     # Verify YouTube is present in the history menu and is on top of the list as the most recent website visited
-    panel_ui.element_attribute_contains("recent-history-content", "value", "YouTube")
+    panel_ui.expect_element_attribute_contains("recent-history-content", "value", "YouTube")

tests/bookmarks_and_history/test_opened_website_in_new_window_present_in_toolbar_history.py

@@ -36,4 +36,4 @@ def test_the_website_opened_in_new_window_is_present_in_history_menu(driver: Fir
     panel_ui.open_history_menu()
 
     # Verify YouTube is present in the history menu and is on top of the list as the most recent website visited
-    panel_ui.element_attribute_contains("recent-history-content", "value", "YouTube")
+    panel_ui.expect_element_attribute_contains("recent-history-content", "value", "YouTube")

tests/bookmarks_and_history/test_toggle_bookmarks_toolbar.py

@@ -24,12 +24,12 @@ def test_toggle_bookmark_toolbar(driver: Firefox):
     # By default, the Bookmarks Toolbar is hidden. The element attribute indicates
     # whether the bookmarks toolbar is either, collapsed = 'true' is hidden,
     # or not collapsed = 'false' is visible.
-    nav.element_attribute_contains("bookmarks-toolbar", "collapsed", "true")
+    nav.expect_element_attribute_contains("bookmarks-toolbar", "collapsed", "true")
 
     # Un-hide the Bookmarks Toolbar with keyboard shortcut.
     nav.toggle_bookmarks_toolbar_with_key_combo()
-    nav.element_attribute_contains("bookmarks-toolbar", "collapsed", "false")
+    nav.expect_element_attribute_contains("bookmarks-toolbar", "collapsed", "false")
 
     # Toggle the Bookmarks Toolbar again and confirm it is hidden.
     nav.toggle_bookmarks_toolbar_with_key_combo()
-    nav.element_attribute_contains("bookmarks-toolbar", "collapsed", "true")
+    nav.expect_element_attribute_contains("bookmarks-toolbar", "collapsed", "true")

tests/drag_and_drop/test_copy_entire_row_column.py

@@ -36,7 +36,7 @@ def test_copy_entire_row_column(driver: Firefox):
 
         # Verify that the row is pasted properly
         for i in range(1, 4):
-            web_page.element_attribute_contains(
+            web_page.expect_element_attribute_contains(
                 "formula-box-input", "innerHTML", str(i)
             )
             web_page.perform_key_combo(Keys.TAB)
@@ -50,7 +50,7 @@ def test_copy_entire_row_column(driver: Firefox):
 
         # Verify that the row is pasted properly
         for i in range(1, 4):
-            web_page.element_attribute_contains(
+            web_page.expect_element_attribute_contains(
                 "formula-box-input", "innerHTML", str(i)
             )
             web_page.perform_key_combo(Keys.TAB)
@@ -70,7 +70,7 @@ def test_copy_entire_row_column(driver: Firefox):
 
         # Verify that the column is pasted properly
         for i in range(1, 4):
-            web_page.element_attribute_contains(
+            web_page.expect_element_attribute_contains(
                 "formula-box-input", "innerHTML", str(i)
             )
             web_page.perform_key_combo(Keys.TAB)
@@ -85,7 +85,7 @@ def test_copy_entire_row_column(driver: Firefox):
 
         # Verify that the column is pasted properly
         for i in range(1, 4):
-            web_page.element_attribute_contains(
+            web_page.expect_element_attribute_contains(
                 "formula-box-input", "innerHTML", str(i)
             )
             web_page.perform_key_combo(Keys.TAB)

tests/drag_and_drop/test_copy_from_an_editor_paste_in_another.py

@@ -44,7 +44,7 @@ def test_copy_from_an_editor_paste_in_another(driver: Firefox, sys_platform):
         for row_index, row in enumerate(expected_values):
             for col_index, expected_value in enumerate(row):
                 # Check that the current cell's value matches expected_value
-                web_page.element_attribute_contains(
+                web_page.expect_element_attribute_contains(
                     "formula-box-input", "innerHTML", expected_value
                 )
                 # Move to the next cell to the right

tests/drag_and_drop/test_copy_hyperlink_table.py

@@ -60,7 +60,7 @@ def test_copy_table_with_hyperlink(driver: Firefox, temp_selectors):
         # Verify that the pasted values are correct
         for row_index, row in enumerate(expected_values):
             for col_index, expected_value in enumerate(row):
-                web_page.element_attribute_contains(
+                web_page.expect_element_attribute_contains(
                     "formula-box-input", "innerHTML", expected_value
                 )
                 # Move to the next cell to the right