fix clear history

Author: ben-c-at-moz

modules/browser_object_panel_ui.py

@@ -135,12 +135,10 @@ def open_history_menu(self) -> BasePage:
         Opens the History menu
         """
         self.open_panel_menu()
-        self.element_visible("panel-main-view")
         # Bug 1974080
         if self.sys_platform() == "Windows":
             sleep(2)
         self.click_on("panel-ui-history")
-        self.element_visible("panel-ui-history-view")
         return self
 
     def select_clear_history_option(self, option: str) -> BasePage:
@@ -267,3 +265,10 @@ def clear_recent_history(self, execute=True) -> BasePage:
             self.click("clear_recent_history")
 
         return self
+
+    @BasePage.context_chrome
+    def confirm_history_clear(self):
+        self.open_history_menu()
+        self.expect_element_attribute_contains(
+            "recent-history-content", "value", "(Empty)"
+        )

modules/data/panel_ui.components.json

@@ -1,11 +1,11 @@
 {
     "context": "chrome",
+    "do-not-cache": true,
     "panel-ui-button": {
         "selectorData": "PanelUI-menu-button",
         "strategy": "id",
         "groups": [
-            "requiredForPage",
-            "doNotCache"
+            "requiredForPage"
         ]
     },
 
@@ -42,9 +42,7 @@
     "fxa-sync-label": {
         "selectorData": "syncnow-label",
         "strategy": "class",
-        "groups": [
-            "doNotCache"
-        ]
+        "groups": []
     },
 
     "new-private-window-option": {
@@ -118,9 +116,7 @@
     "panel-ui-history-view": {
         "selectorData": "PanelUI-history",
         "strategy": "id",
-        "groups": [
-            "doNotCache"
-        ]
+        "groups": []
     },
 
     "panel-ui-history-recently-closed": {

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()