Merge main

soncuteanca · soncuteanca · commit 6e2681c68de1 · 2025-06-27T12:14:25.000+03:00
diff --git a/SELECTOR_INFO.md b/SELECTOR_INFO.md
@@ -3043,6 +3043,12 @@ Location: Toolbar
 Path to .json: modules/data/panel_ui.components.json
 ```
 ```
+Selector name: panel-main-view
+Description: Main body of Panel UI
+Location: See above
+Path to .json: modules/data/panel_ui.components.json
+```
+```
 Selector name: sync-user-button
 Selector Data: toolbarbutton[id='fxa-toolbar-menu-button']
 Description: Account button
@@ -3148,6 +3154,12 @@ Location: Firefox menu
 Path to .json: modules/data/panel_ui.components.json
 ```
 ```
+Selector name: panel-ui-history-view
+Description: Subview of Panel UI
+Location: See above
+Path to .json: modules/data/panel_ui.components.json
+```
+```
 Selector name: panel-ui-history-recently-closed
 Selector Data: appMenuRecentlyClosedTabs
 Description: Recently closed tabs
diff --git a/modules/browser_object_find_toolbar.py b/modules/browser_object_find_toolbar.py
@@ -21,7 +21,7 @@ def __init__(self, driver: Firefox, **kwargs):
     def open(self) -> BasePage:
         """Use PanelUi to open the Find Toolbar, wait for element to load"""
         self.panel_ui.open_panel_menu()
-        self.panel_ui.select_panel_setting("find-in-page")
+        self.panel_ui.click_on("find-in-page")
         self.wait_for_page_to_load()
         return self
 
diff --git a/modules/browser_object_panel_ui.py b/modules/browser_object_panel_ui.py
@@ -1,3 +1,4 @@
+from time import sleep
 from typing import List
 
 from pypom import Region
@@ -44,48 +45,30 @@ def open_panel_menu(self) -> BasePage:
         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:
-        """
-        Selects a panel setting in PanelUi.
-
-        ...
-
-        Parameters
-        ----------
-
-        name: str
-            Name of setting element
-        labels: *list[str]
-            Labels to pass to get_element()
-        """
-        self.click_on(name, labels=labels)
+        sleep(2)  # Bug 1974080
         return self
 
     def navigate_to_about_addons(self):
         """
         On the hamburger menu > More Tools > Customize Toolbar > Manage Themes
         """
-        self.select_panel_setting("more-tools")
-        self.select_panel_setting("customize-toolbar")
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("manage-themes").click()
+        self.click_on("more-tools")
+        self.click_on("customize-toolbar")
+        self.click_on("manage-themes")
 
     def navigate_to_customize_toolbar(self):
         """
         On the hamburger menu > More Tools > Customize Toolbar
         """
-        self.select_panel_setting("more-tools")
-        self.select_panel_setting("customize-toolbar")
+        self.click_on("more-tools")
+        self.click_on("customize-toolbar")
 
     def click_sync_sign_in_button(self) -> BasePage:
         """
         Click FxA sync button.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.open_panel_menu()
-            self.select_panel_setting("fxa-sign-in")
+        self.open_panel_menu()
+        self.click_on("fxa-sign-in")
         return self
 
     def log_out_fxa(self) -> BasePage:
@@ -147,13 +130,13 @@ def open_private_window(self) -> BasePage:
             self.get_element("panel-ui-new-private-window").click()
         return self
 
+    @BasePage.context_chrome
     def open_history_menu(self) -> BasePage:
         """
         Opens the History menu
         """
         self.open_panel_menu()
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("panel-ui-history").click()
+        self.click_on("panel-ui-history")
         return self
 
     def select_clear_history_option(self, option: str) -> BasePage:
@@ -261,3 +244,39 @@ def get_bookmark_tags(self, tags: List[str]) -> List[str]:
             )
             for tag in tags
         ]
+
+    @BasePage.context_chrome
+    def clear_recent_history(self, execute=True) -> BasePage:
+        """Clears recent history. Case of execute=True may not be complete"""
+        self.open_panel_menu()
+        self.get_element("panel-ui-history").click()
+
+        self.element_exists("clear-recent-history")
+        self.element_visible("clear-recent-history")
+        self.element_clickable("clear-recent-history")
+        if execute:
+            self.click("clear_recent_history")
+
+        return self
+
+    @BasePage.context_chrome
+    def confirm_history_clear(self):
+        """Confirm that the history is empty"""
+        self.open_history_menu()
+        self.expect_element_attribute_contains(
+            "recent-history-content", "value", "(Empty)"
+        )
+
+    @BasePage.context_chrome
+    def reopen_recently_closed_tabs(self) -> BasePage:
+        """Reopen all recently closed tabs"""
+        self.open_panel_menu()
+        self.click_on("panel-ui-history")
+
+        self.click_on("panel-ui-history-recently-closed")
+        if self.sys_platform() == "Linux":
+            sleep(2)
+
+        self.click_on("panel-ui-history-recently-closed-reopen-tabs")
+
+        return self
diff --git a/modules/browser_object_print_preview.py b/modules/browser_object_print_preview.py
@@ -21,13 +21,13 @@ class PrintPreview(BasePage):
 
     URL_TEMPLATE = "about:blank"
 
+    @BasePage.context_chrome
     def open(self) -> BasePage:
         """Use PanelUi to open the Print Preview, wait for element to load"""
         panel_ui = PanelUi(self.driver)
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            panel_ui.open_panel_menu()
-            panel_ui.select_panel_setting("print-option")
-            self.wait_for_page_to_load()
+        panel_ui.open_panel_menu()
+        panel_ui.click_on("print-option")
+        self.wait_for_page_to_load()
         return self
 
     def open_with_key_combo(self) -> BasePage:
diff --git a/modules/data/panel_ui.components.json b/modules/data/panel_ui.components.json
@@ -1,14 +1,20 @@
 {
     "context": "chrome",
+    "do-not-cache": true,
     "panel-ui-button": {
         "selectorData": "PanelUI-menu-button",
         "strategy": "id",
         "groups": [
-            "requiredForPage",
-            "doNotCache"
+            "requiredForPage"
         ]
     },
 
+    "panel-main-view": {
+        "selectorData": "appMenu-mainView",
+        "strategy": "id",
+        "groups": []
+    },
+
     "sync-user-button": {
         "selectorData": "toolbarbutton[id='fxa-toolbar-menu-button']",
         "strategy": "css",
@@ -36,9 +42,7 @@
     "fxa-sync-label": {
         "selectorData": "syncnow-label",
         "strategy": "class",
-        "groups": [
-            "doNotCache"
-        ]
+        "groups": []
     },
 
     "new-private-window-option": {
@@ -109,6 +113,12 @@
         "groups": []
     },
 
+    "panel-ui-history-view": {
+        "selectorData": "PanelUI-history",
+        "strategy": "id",
+        "groups": []
+    },
+
     "panel-ui-history-recently-closed": {
         "selectorData": "appMenuRecentlyClosedTabs",
         "strategy": "id",
@@ -324,4 +334,4 @@
         "strategy": "id",
         "groups": []
     }
-}
+}
diff --git a/taskcluster/requirements.txt b/taskcluster/requirements.txt
@@ -280,9 +280,9 @@ text-unidecode==1.3 \
     --hash=sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8 \
     --hash=sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93
     # via python-slugify
-urllib3==2.2.2 \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via requests
 voluptuous==0.13.1 \
     --hash=sha256:4b838b185f5951f2d6e8752b68fcf18bd7a9c26ded8f143f92d6d28f3921a3e6 \
diff --git a/tests/address_bar_and_search/test_search_modes_for_sites.py b/tests/address_bar_and_search/test_search_modes_for_sites.py
@@ -17,6 +17,7 @@ def test_case():
     return "3028754"
 
 
+@pytest.mark.unstable(reason="Google re-captcha and manual tagged this test as removed")
 @pytest.mark.parametrize("search_engine, prefix, url", SEARCH_MODES)
 def test_search_modes_for_sites(
     driver: Firefox, search_engine: str, prefix: str, url: str
diff --git a/tests/bookmarks_and_history/test_clear_all_history.py b/tests/bookmarks_and_history/test_clear_all_history.py
@@ -3,7 +3,6 @@
 
 from modules.browser_object import PanelUi
 from modules.page_object import GenericPage
-from modules.util import BrowserActions
 
 
 @pytest.fixture()
@@ -20,16 +19,12 @@ def test_clear_all_history(driver: Firefox):
     """
     C172045: Verify that the user can Clear all the History
     """
+    gen_page = GenericPage(driver)
     panel_ui = PanelUi(driver)
     panel_ui.open()
-    gen_page = GenericPage(driver)
     panel_ui.open_history_menu()
-    ba = BrowserActions(driver)
 
     panel_ui.select_clear_history_option("Everything")
 
-    gen_page.get_element("clear-history-button").click()
-    ba.switch_to_content_context()
-
-    panel_ui.open_history_menu()
-    panel_ui.element_does_not_exist("bookmark-item")
+    gen_page.click_on("clear-history-button")
+    panel_ui.confirm_history_clear()
diff --git a/tests/bookmarks_and_history/test_clear_recent_history_displayed.py b/tests/bookmarks_and_history/test_clear_recent_history_displayed.py
@@ -16,10 +16,4 @@ def test_clear_recent_history_displayed(driver: Firefox):
     panel_ui = PanelUi(driver)
     panel_ui.open()
 
-    panel_ui.open_panel_menu()
-    with driver.context(driver.CONTEXT_CHROME):
-        panel_ui.get_element("panel-ui-history").click()
-
-        panel_ui.element_exists("clear-recent-history")
-        panel_ui.element_visible("clear-recent-history")
-        panel_ui.element_clickable("clear-recent-history")
+    panel_ui.clear_recent_history(execute=False)
diff --git a/tests/bookmarks_and_history/test_opened_website_in_new_tab_present_in_toolbar_history.py b/tests/bookmarks_and_history/test_opened_website_in_new_tab_present_in_toolbar_history.py
@@ -1,8 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_panel_ui import PanelUi
-from modules.browser_object_tabbar import TabBar
+from modules.browser_object import PanelUi, TabBar
 from modules.page_object_generics import GenericPage
 
 
diff --git a/tests/form_autofill/test_form_autofill_suggestions.py b/tests/form_autofill/test_form_autofill_suggestions.py
@@ -40,6 +40,7 @@ def test_form_autofill_suggestions(
 
     # verify form data in reverse (newer options are at the top)
     for idx in range(1, 3):
+        autofill_popup.ensure_autofill_dropdown_visible()
         autofill_popup.select_nth_element(idx)
         credit_card_autofill.verify_form_data(sample_data[idx - 1])
         credit_card_autofill.click_on("form-field", labels=["cc-name"])
diff --git a/tests/password_manager/test_primary_password_triggered_on_about_logins_access.py b/tests/password_manager/test_primary_password_triggered_on_about_logins_access.py
@@ -1,3 +1,5 @@
+from platform import system
+
 import pytest
 from selenium.webdriver import Firefox, Keys
 
@@ -16,6 +18,9 @@ def test_case():
     return "2245199"
 
 
+@pytest.mark.skipif(
+    system().lower().startswith("linux"), reason="Currently unstable in linux"
+)
 def test_primary_password_triggered_on_about_logins_access_via_hamburger_menu(
     driver: Firefox,
 ):
diff --git a/tests/preferences/test_firefox_home_on_launch.py b/tests/preferences/test_firefox_home_on_launch.py
@@ -38,7 +38,7 @@ def test_firefox_home_on_launch(driver: Firefox, sys_platform: str):
     # make sure that the option was selected correctly
     assert drop_down.get_attribute("label") == "Firefox Home (Default)"
     panel_ui.open_panel_menu()
-    panel_ui.select_panel_setting("panel-ui-new-window")
+    panel_ui.click_on("panel-ui-new-window")
     # wait for the number of tabs and switch
     tabs.wait_for_num_tabs(2)
     driver.switch_to.window(driver.window_handles[-1])
diff --git a/tests/printing_ui/test_print_to_pdf.py b/tests/printing_ui/test_print_to_pdf.py
@@ -1,5 +1,6 @@
 import logging
 import os
+from platform import system
 
 import pytest
 from selenium.webdriver import Firefox
@@ -44,6 +45,7 @@ def file_is_somewhere():
     return False
 
 
+@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1974011")
 @pytest.mark.headed
 def test_print_to_pdf(
     driver: Firefox,
diff --git a/tests/security_and_privacy/test_never_remember_browsing_history.py b/tests/security_and_privacy/test_never_remember_browsing_history.py
@@ -71,26 +71,7 @@ def test_never_remember_browsing_history_from_panel(driver: Firefox):
         tabs.switch_to_new_tab()
 
     # close the first 6 tabs
-    with driver.context(driver.CONTEXT_CHROME):
-        x_icon = tabs.get_element("tab-x-icon", multiple=True)
-        for i in range(num_tabs):
-            x_icon[i].click()
-
-        panel_ui.open_panel_menu()
-
-        # go into the history tab
-        panel_ui.get_element("panel-ui-history").click()
-
-        # check for history
-        recently_visited_container = panel_ui.get_element(
-            "panel-ui-history-recent-history-container"
-        )
-        recently_visited_items = panel_ui.get_element(
-            "panel-ui-history-recent-history-item",
-            multiple=True,
-            parent_element=recently_visited_container,
-        )
-
-        # ensure no actual items are there
-        assert len(recently_visited_items) == 1
-        assert recently_visited_items[0].get_attribute("label") == "(Empty)"
+    for i in range(num_tabs):
+        tabs.close_tab(tabs.get_tab(num_tabs - i))
+
+    panel_ui.confirm_history_clear()
diff --git a/tests/security_and_privacy/test_private_window_from_panelui.py b/tests/security_and_privacy/test_private_window_from_panelui.py
@@ -14,6 +14,6 @@ def test_private_window_from_panelui(driver: Firefox):
     """C101660 - Private Browsing can be successfully opened via the Hamburger menu"""
     panelui = PanelUi(driver)
     panelui.open_panel_menu()
-    panelui.select_panel_setting("new-private-window-option")
+    panelui.click_on("new-private-window-option")
     panelui.switch_to_new_window()
     AboutPrivatebrowsing(driver).wait_for_page_to_load()
diff --git a/tests/security_and_privacy/test_third_party_content_blocked_private_browsing.py b/tests/security_and_privacy/test_third_party_content_blocked_private_browsing.py
@@ -103,6 +103,7 @@ def test_third_party_content_blocked_private_browsing_allowed_tracking(driver: F
         assert item.get_attribute("value") in ALLOWED_TRACKING_URLS
 
 
+@pytest.mark.skip(reason="Bug 1973795")
 def test_third_party_content_private_browsing_tracking_statuses(driver: Firefox):
     """
     C446323.3: Ensure that the statuses of some third party content are loaded properly
diff --git a/tests/tabs/test_reopen_tab_through_history_menu.py b/tests/tabs/test_reopen_tab_through_history_menu.py
diff --git a/tests/theme_and_toolbar/test_customize_themes_and_redirect.py b/tests/theme_and_toolbar/test_customize_themes_and_redirect.py
