Add refactored test 174072

Author: soncuteanca

modules/browser_object_forget_panel.py

@@ -5,16 +5,35 @@
 
 class ForgetPanel(BasePage):
     """
-    BOM for the forget panel
+    BOM for the Forget Panel
     """
 
     URL_TEMPLATE = ""
 
+    @BasePage.context_chrome
+    def select_timeframe(
+        self,
+        timeframe: Literal["forget-five-minutes", "forget-two-hours", "forget-one-day"],
+    ) -> "ForgetPanel":
+        """
+        Select a specific timeframe option in the forget panel.
+        This will click the option regardless of what's currently selected.
+
+        Argument:
+            timeframe: Timeframe to forget. Restricted options to "forget-five-minutes",
+                      "forget-two-hours", or "forget-one-day"
+        """
+        self.click_on(timeframe)
+        return self
+
+    @BasePage.context_chrome
     def forget_history(
         self,
         timeframe: Literal["forget-five-minutes", "forget-two-hours", "forget-one-day"],
-    ) -> BasePage:
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element(timeframe).click()
-            self.get_element("forget-confirm-button").click()
-            return self
+    ) -> "ForgetPanel":
+        """
+        Forget browsing history for a given timeframe.
+        """
+        self.select_timeframe(timeframe)
+        self.click_on("forget-confirm-button")
+        return self

modules/browser_object_navigation.py

@@ -342,6 +342,12 @@ def select_element_in_nav(self, element: str) -> BasePage:
         self.get_element(element).click()
         return self
 
+    @BasePage.context_chrome
+    def open_forget_panel(self) -> BasePage:
+        """Open the Forget Panel by clicking the Forget button in the toolbar."""
+        self.get_element("forget-button").click()
+        return self
+
     @BasePage.context_chrome
     def get_legacy_search_engine_label(self) -> str:
         """Return the displayed engine name from the legacy search bar."""

modules/browser_object_tabbar.py

@@ -283,12 +283,33 @@ def close_tab(self, tab: WebElement) -> BasePage:
         self.get_element("tab-x-icon", parent_element=tab).click()
         return self
 
-    def open_web_page_in_new_tab(self, web_page: BasePage, num_tabs: int) -> BasePage:
+    def open_single_page_in_new_tab(self, page: BasePage, num_tabs: int) -> BasePage:
         """
         Opens a new tab, switches the driver context to the new tab, and opens the given webpage
+        Arguments:
+            page: The page object to open in the new tab
+            num_tabs: Expected total number of tabs after opening the new tab (used for waiting)
         """
         self.new_tab_by_button()
         self.wait_for_num_tabs(num_tabs)
         self.driver.switch_to.window(self.driver.window_handles[-1])
-        web_page.open()
+        page.open()
+        return self
+
+    def open_multiple_tabs_with_pages(self, pages: list) -> "TabBar":
+        """
+        Opens multiple new tabs and navigates to different pages in each tab.
+
+        Argument:
+            pages: List of page objects or URLs to open in separate tabs
+        """
+        for page in pages:
+            self.new_tab_by_button()
+            self.wait_for_num_tabs(len(self.driver.window_handles))
+            self.driver.switch_to.window(self.driver.window_handles[-1])
+
+            if isinstance(page, str):
+                self.driver.get(page)
+            else:
+                page.open()
         return self

tests/bookmarks_and_history/test_opened_website_in_new_tab_present_in_hamburger_history_menu.py

@@ -29,7 +29,7 @@ def test_the_website_opened_in_new_tab_is_present_in_history_menu(driver: Firefo
     panel = PanelUi(driver)
 
     # Open a desired webpage in a new tab
-    tabs.open_web_page_in_new_tab(page, 2)
+    tabs.open_single_page_in_new_tab(page, 2)
     page.url_contains("wikipedia")
 
     # Verify the opened webpage from last step is present in the Hamburger Menu, History section and is on top of the

tests/bookmarks_and_history/test_user_can_forget_history.py

@@ -10,7 +10,7 @@ def test_case():
     return "174072"
 
 
-links = [
+ABOUT_PAGES = [
     "about:about",
     "about:addons",
     "about:cache",
@@ -22,37 +22,25 @@ def test_user_can_forget_history(driver: Firefox):
     """
     C174072: Verify that the user can Forget all the history from the last 5 minutes
     """
+    # Instantiate objects
     tabs = TabBar(driver)
-    panel_ui = PanelUi(driver)
+    panel = PanelUi(driver)
     nav = Navigation(driver)
     forget_panel = ForgetPanel(driver)
-    gen_page = GenericPage(driver, url="https://www.google.com/")
     customize_firefox = CustomizeFirefox(driver)
 
-    tabs_to_open = 4
-
-    for i in range(tabs_to_open):
-        driver.get(links[i])
-        tabs.new_tab_by_button()
-        tabs.switch_to_new_tab()
-
-    panel_ui.open_panel_menu()
-    panel_ui.navigate_to_customize_toolbar()
+    # Add the Forget button to the toolbar
+    panel.open_panel_menu()
+    panel.navigate_to_customize_toolbar()
     customize_firefox.add_widget_to_toolbar("forget")
 
-    tabs.new_tab_by_button()
-    tabs.switch_to_new_tab()
-
-    gen_page.open()
-
-    with driver.context(driver.CONTEXT_CHROME):
-        nav.get_element("forget-button").click()
-        assert (
-            forget_panel.get_element("forget-five-minutes").get_attribute("selected")
-            == "true"
-        )
+    # Create history
+    tabs.open_multiple_tabs_with_pages(ABOUT_PAGES)
 
+    # Use Forget button to clear the last 5 minutes of history
+    nav.open_forget_panel()
     forget_panel.forget_history("forget-five-minutes")
 
+    # Verify history was removed
     tabs.switch_to_new_tab()
-    panel_ui.element_does_not_exist("bookmark-item")
+    panel.element_does_not_exist("bookmark-item")

tests/geolocation/test_geolocation_shared_via_html5.py

@@ -56,7 +56,7 @@ def test_allow_permission_on_geolocation_via_html5(driver: Firefox):
     wait_for_geolocation_data(web_page)
 
     # Allow the location sharing while choose the option Remember this decision
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=2)
     nav.element_clickable("checkbox-remember-this-decision")
     nav.click_on("checkbox-remember-this-decision")
     nav.handle_geolocation_prompt(button_type="primary")
@@ -65,7 +65,7 @@ def test_allow_permission_on_geolocation_via_html5(driver: Firefox):
     wait_for_geolocation_data(web_page)
 
     # Assert that the permission icon is displayed in address bar when in a new tab
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=3)
     with driver.context(driver.CONTEXT_CHROME):
         permission_icon = nav.get_element("permissions-location-icon")
         assert permission_icon.is_displayed()
@@ -91,7 +91,7 @@ def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox):
     )
 
     # Block the location sharing while choose the option Remember this decision
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=2)
     nav.element_clickable("checkbox-remember-this-decision")
     nav.click_on("checkbox-remember-this-decision")
     nav.handle_geolocation_prompt(button_type="secondary")
@@ -104,7 +104,7 @@ def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox):
     )
 
     # Assert that the permission icon is displayed in address bar when in a new tab
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=3)
     with driver.context(driver.CONTEXT_CHROME):
         permission_icon = nav.get_element("permissions-location-icon")
         assert permission_icon.is_displayed()

tests/geolocation/test_geolocation_shared_via_w3c_api.py

@@ -73,7 +73,7 @@ def test_allow_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selec
     assert web_page.get_element("location-marker").get_attribute("style")
 
     # Open a new tab, because refresh will keep the allow state of the location for one hour or until the tab is closed
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=2)
 
     # Click the 'Try It' button and Allow the location sharing while choose the option Remember this decision
     web_page.click_on("geolocation-button-selector")
@@ -85,7 +85,7 @@ def test_allow_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selec
     assert web_page.get_element("location-marker").get_attribute("style")
 
     # Assert that the permission icon is displayed in address bar when in a new tab
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=3)
     with driver.context(driver.CONTEXT_CHROME):
         permission_icon = nav.get_element("permissions-location-icon")
         assert permission_icon.is_displayed()
@@ -117,7 +117,7 @@ def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selec
     assert not web_page.get_element("location-marker").get_attribute("style")
 
     # Click the 'Try It' button and Block the location sharing while choose the option Remember this decision
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=2)
     web_page.click_on("geolocation-button-selector")
     nav.handle_geolocation_prompt(button_type="secondary", remember_this_decision=True)
 
@@ -126,7 +126,7 @@ def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selec
     assert not web_page.get_element("location-marker").get_attribute("style")
 
     # Assert that the permission icon is displayed in address bar when in a new tab
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
+    tabs.open_single_page_in_new_tab(web_page, num_tabs=3)
     with driver.context(driver.CONTEXT_CHROME):
         permission_icon = nav.get_element("permissions-location-icon")
         assert permission_icon.is_displayed()