Add open bookmarks tests

Author: soncuteanca

modules/browser_object_navigation.py

@@ -544,3 +544,50 @@ def verify_edit_bookmark_panel_not_visible_after_navigation(self) -> BasePage:
         self.click_on("star-button")
         self.panel_ui.element_not_visible("show-editor-when-saving-checkbox")
         return self
+
+    def open_bookmark_from_toolbar(self, bookmark_title: str) -> BasePage:
+        """
+        Right-clicks bookmark and opens it in a new private window via context menu
+        Arguments:
+            bookmark_title: The title of the bookmark to open
+        """
+        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_title])
+        return self
+
+    @BasePage.context_chrome
+    def open_bookmark_in_new_window_via_context_menu(
+        self, bookmark_title: str
+    ) -> BasePage:
+        """
+        Right-click bookmark and opens it in a new window via context menu
+        Arguments:
+            bookmark_title: The title of the bookmark to open
+        """
+        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_title])
+        self.context_menu.click_on("context-menu-toolbar-open-in-new-window")
+        return self
+
+    @BasePage.context_chrome
+    def open_bookmark_in_new_private_window_via_context_menu(
+        self, bookmark_title: str
+    ) -> BasePage:
+        """
+        Right-clicks bookmark and opens it in a new private window via context menu
+        Arguments:
+            bookmark_title: The title of the bookmark to open
+        """
+        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_title])
+        self.context_menu.click_on("context-menu-toolbar-open-in-new-private-window")
+        return self
+
+    @BasePage.context_chrome
+    def open_all_bookmarks_via_context_menu(self) -> BasePage:
+        """
+        Right-clicks on bookmarks toolbar and opens all bookmarks via context menu
+        """
+        self.context_click("bookmarks-toolbar")
+        self.context_menu.click_on("context-menu-toolbar-open-all-bookmarks")
+        return self

tests/bookmarks_and_history/test_open_all_bookmarks_from_bookmarks_toolbar.py

@@ -1,9 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_context_menu import ContextMenu
 from modules.browser_object_navigation import Navigation
-from modules.browser_object_panel_ui import PanelUi
 from modules.page_object_generics import GenericPage
 
 
@@ -12,40 +10,35 @@ def test_case():
     return "2084564"
 
 
-URL1_TO_BOOKMARK = "https://www.reddit.com/"
-URL2_TO_BOOKMARK = "https://www.youtube.com/"
-URL3_TO_BOOKMARK = "https://www.mozilla.org/"
-URL_NOT_BOOKMARKED = "https://www.wikipedia.org/"
+BOOKMARK_URLS = [
+    "https://www.reddit.com/",
+    "https://www.youtube.com/",
+    "https://www.mozilla.org/",
+]
+UNBOOKMARKED_URL = "https://www.wikipedia.org/"
+EXPECTED_URL_SITE_NAME = ["reddit", "youtube", "mozilla"]
 
 
 def test_open_all_bookmarks_from_bookmarks_toolbar(driver: Firefox):
     """
     C2084564: Verify that the user can Open all the bookmarks from the Bookmarks Toolbar
     """
-    # instantiate object
+    # Instantiate objects
     nav = Navigation(driver)
-    panel = PanelUi(driver)
-    context_menu = ContextMenu(driver)
     page = GenericPage(driver)
 
-    # Have a few Bookmarks saved on the Toolbar
-    urls_to_bookmark = [URL1_TO_BOOKMARK, URL2_TO_BOOKMARK, URL3_TO_BOOKMARK]
-    for url in urls_to_bookmark:
+    # Have a few Bookmarks saved on Toolbar
+    for url in BOOKMARK_URLS:
         GenericPage(driver, url=url).open()
         nav.add_bookmark_via_star_icon()
 
     # Load a page that we didn't bookmark, so we can ensure that we're not just picking up on that instance of the page
-    GenericPage(driver, url=URL_NOT_BOOKMARKED).open()
+    GenericPage(driver, url=UNBOOKMARKED_URL).open()
 
-    # Toggle bookmarks toolbar
-    # nav.toggle_bookmarks_toolbar_with_key_combo()
-
-    # Right-click on a blank space from Bookmarks Toolbar menu and choose open all bookmarks
-    panel.context_click("bookmarks-toolbar")
-    context_menu.click_and_hide_menu("context-menu-toolbar-open-all-bookmarks")
+    # Right-click on a blank space from Bookmarks Toolbar menu and choose Open All Bookmarks from the context menu
+    nav.open_all_bookmarks_via_context_menu()
 
     # Check that all the bookmarks from the Bookmarks Toolbar are opened in New Tabs
-    expected_urls = ["reddit", "youtube", "mozilla"]
-    for index, url_part in enumerate(expected_urls, start=1):
+    for index, url_site_name in enumerate(EXPECTED_URL_SITE_NAME, start=1):
         driver.switch_to.window(driver.window_handles[index])
-        page.url_contains(url_part)
+        page.url_contains(url_site_name)

tests/bookmarks_and_history/test_open_bookmark_in_new_window_via_toolbar_context_menu.py

@@ -1,7 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import ContextMenu, Navigation, PanelUi, TabBar
+from modules.browser_object import Navigation, TabBar
 from modules.page_object_generics import GenericPage
 
 
@@ -10,35 +10,30 @@ def test_case():
     return "2084552"
 
 
-URL_TO_BOOKMARK = "https://www.mozilla.org/"
+BOOKMARK_URL = "https://www.mozilla.org/"
+BOOKMARK_TITLE = "Internet for people"
 
 
 def test_open_bookmark_in_new_window_via_toolbar_context_menu(driver: Firefox):
     """
     C2084552: Verify that a bookmarked page can be open in a New Window from Toolbar context menu.
     """
 
-    # Instantiate object
+    # Instantiate objects
     nav = Navigation(driver)
-    panel = PanelUi(driver)
     tabs = TabBar(driver)
-    context_menu = ContextMenu(driver)
-    page = GenericPage(driver, url=URL_TO_BOOKMARK)
+    page = GenericPage(driver, url=BOOKMARK_URL)
 
     # Bookmark the test page via star button
     page.open()
     nav.add_bookmark_via_star_icon()
 
-    # In a new tab, right-click the bookmarked page in the toolbar and select 'Open in New Window' from the context menu
-    with driver.context(driver.CONTEXT_CHROME):
-        tabs.new_tab_by_button()
-        panel.element_clickable("bookmark-by-title", labels=["Internet for people"])
-        panel.context_click("bookmark-by-title", labels=["Internet for people"])
-        context_menu.click_and_hide_menu("context-menu-toolbar-open-in-new-window")
+    # In a new tab, right-click the bookmarked page in the toolbar and select Open in New Window from the context menu
+    tabs.new_tab_by_button()
+    nav.open_bookmark_in_new_window_via_context_menu(BOOKMARK_TITLE)
 
     # Verify that the test page is opened in a new normal window
     tabs.wait_for_num_tabs(3)
     driver.switch_to.window(driver.window_handles[-1])
     assert not nav.is_private()
-
     page.url_contains("mozilla")

tests/bookmarks_and_history/test_open_bookmark_in_private_window_via_toolbar_context_menu.py

@@ -10,34 +10,28 @@ def test_case():
     return "2084553"
 
 
-URL_TO_BOOKMARK = "https://www.mozilla.org/"
+BOOKMARK_URL = "https://www.mozilla.org/"
+BOOKMARK_TITLE = "Internet for people"
 
 
 def test_open_bookmark_in_new_private_window_via_toolbar_context_menu(driver: Firefox):
     """
     C2084553: Verify that a bookmarked page can be open in a New Private Window from Toolbar context menu.
     """
 
-    # Instantiate object
+    # Instantiate objects
     nav = Navigation(driver)
-    panel = PanelUi(driver)
     tabs = TabBar(driver)
-    context_menu = ContextMenu(driver)
-    page = GenericPage(driver, url=URL_TO_BOOKMARK)
+    page = GenericPage(driver, url=BOOKMARK_URL)
 
     # Bookmark the test page via star button
     page.open()
     nav.add_bookmark_via_star_icon()
 
     # In a new tab, right-click the bookmarked page in the toolbar and select 'Open in New Private Window' from the
     # context menu
-    with driver.context(driver.CONTEXT_CHROME):
-        tabs.new_tab_by_button()
-        panel.element_clickable("bookmark-by-title", labels=["Internet for people"])
-        panel.context_click("bookmark-by-title", labels=["Internet for people"])
-        context_menu.click_and_hide_menu(
-            "context-menu-toolbar-open-in-new-private-window"
-        )
+    tabs.new_tab_by_button()
+    nav.open_bookmark_in_new_private_window_via_context_menu(BOOKMARK_TITLE)
 
     # Verify that the test page is opened in a new private window
     tabs.wait_for_num_tabs(3)

tests/bookmarks_and_history/test_open_bookmarks_from_toolbar.py

@@ -2,7 +2,6 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
-from modules.browser_object_panel_ui import PanelUi
 from modules.browser_object_tabbar import TabBar
 from modules.page_object_generics import GenericPage
 
@@ -12,27 +11,26 @@ def test_case():
     return "2084550"
 
 
-URL_TO_BOOKMARK = "https://www.mozilla.org/"
+BOOKMARK_URL = "https://www.mozilla.org/"
+BOOKMARK_TITLE = "Internet for people"
 
 
 def test_open_bookmarks_from_toolbar(driver: Firefox):
     """
     C2084550: Verify that the user can open Bookmarks from the Toolbar with a mouse click
     """
-    # instantiate object
+    # Instantiate object
     nav = Navigation(driver)
-    panel = PanelUi(driver)
-    newtab = TabBar(driver)
-    page = GenericPage(driver, url=URL_TO_BOOKMARK)
+    tab = TabBar(driver)
+    page = GenericPage(driver, url=BOOKMARK_URL)
 
     # Bookmark the given website via star button
-    driver.get(URL_TO_BOOKMARK)
+    page.open()
     nav.add_bookmark_via_star_icon()
 
     # Open new tab and click on the bookmark from the Bookmarks Toolbar
-    with driver.context(driver.CONTEXT_CHROME):
-        newtab.new_tab_by_button()
-        panel.get_element("bookmark-by-title", labels=["Internet for people"]).click()
+    tab.new_tab_by_button()
+    nav.open_bookmark_from_toolbar(BOOKMARK_TITLE)
 
     # Verify that the page is loaded
     page.title_contains("Internet for people")