Refactor clear history tests

Author: soncuteanca

modules/browser_object_panel_ui.py

@@ -163,19 +163,27 @@ def open_history_menu(self) -> BasePage:
         self.click_on("panel-ui-history")
         return self
 
-    def select_clear_history_option(self, option: str) -> BasePage:
+    @BasePage.context_chrome
+    def open_clear_history_dialog(self) -> BasePage:
+        """Opens the clear history dialog and switches to iframe context"""
+        self.open_history_menu()
+        self.element_clickable("clear-recent-history")
+        self.click_on("clear-recent-history")
+
+        self.element_visible("iframe")
+        iframe = self.get_element("iframe")
+        BrowserActions(self.driver).switch_to_iframe_context(iframe)
+        return self
+
+    @BasePage.context_content
+    def select_history_time_range_option(self, option: str) -> BasePage:
         """
-        Selects the clear history option, assumes the history panel is open.
+        Selects time range option (assumes already in iframe context)
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("clear-recent-history").click()
-            iframe = self.get_element("iframe")
-            BrowserActions(self.driver).switch_to_iframe_context(iframe)
-
-            with self.driver.context(self.driver.CONTEXT_CONTENT):
-                dropdown_root = self.get_element("clear-history-dropdown")
-                dropdown = Dropdown(page=self, root=dropdown_root, require_shadow=False)
-                dropdown.select_option(option)
+        dropdown_root = self.get_element("clear-history-dropdown")
+        dropdown = Dropdown(page=self, root=dropdown_root, require_shadow=False)
+        dropdown.select_option(option)
+        return self
 
     def get_all_history(self) -> List[WebElement]:
         """
@@ -269,20 +277,6 @@ 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"""

tests/bookmarks_and_history/test_clear_all_history.py

@@ -19,12 +19,19 @@ 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()
-    panel_ui.open_history_menu()
 
-    panel_ui.select_clear_history_option("Everything")
+    # Instantiate objects
+    page = GenericPage(driver)
+    panel = PanelUi(driver)
 
-    gen_page.click_on("clear-history-button")
-    panel_ui.confirm_history_clear()
+    # Open Clear History menu
+    panel.open_clear_history_dialog()
+
+    # Select the option to clear all the history
+    panel.select_history_time_range_option("Everything")
+    # A method in panel-ui with selectors moved accordingly would work better, limited for now due to context level
+    # set to chrome context while shadow parent needs content context
+    page.click_on("clear-history-button")
+
+    # Verify all the history is deleted
+    panel.confirm_history_clear()

tests/bookmarks_and_history/test_clear_recent_history_displayed.py

@@ -13,7 +13,10 @@ def test_clear_recent_history_displayed(driver: Firefox):
     """
     C172043: Clear recent history panel displayed
     """
-    panel_ui = PanelUi(driver)
-    panel_ui.open()
 
-    panel_ui.clear_recent_history(execute=False)
+    # Instantiate object
+    panel = PanelUi(driver)
+
+    # Open Clear recent history dialog
+    panel.open()
+    panel.open_clear_history_dialog()