Add edit tests

Author: soncuteanca

SELECTOR_INFO.md

@@ -2755,13 +2755,6 @@ Location: Download panel
 Path to .json: modules/data/navigation.components.json
 ```
 ```
-Selector name: edit-bookmark-panel
-Selector Data: editBMPanel_namePicker
-Description: Edit bookmark panel
-Location: Bookmark panel
-Path to .json: modules/data/navigation.components.json
-```
-```
 Selector name: remove-bookmark-button
 Selector Data: editBookmarkPanelRemoveButton
 Description: Remove bookmark button
@@ -3392,6 +3385,14 @@ Description: Bookmarks toolbar
 Location: Bookmarks toolbar
 Path to .json: modules/data/panel_ui.components.json
 ```
+```
+Selector name: edit-bookmark-panel
+Selector Data: editBMPanel_namePicker
+Description: Edit bookmark panel
+Location: Bookmark panel
+Path to .json: modules/data/pane_ui.components.json
+```
+```
 #### print_preview
 ```
 Selector name: print-preview-browser

modules/browser_object_navigation.py

@@ -359,7 +359,13 @@ def bookmark_page_in_other_bookmarks(self) -> BasePage:
     def add_bookmark_via_toolbar_other_bookmark_context_menu(
         self, bookmark_data: Bookmark, ba: BrowserActions
     ) -> BasePage:
-        """Add a bookmark via the toolbar's Other Bookmarks context menu."""
+        """
+        Add a bookmark via the toolbar's Other Bookmarks context menu.
+        Arguments
+        ----------
+        bookmark_data : A Bookmark object containing the bookmark details to be added (name, url, tags, keyword)
+        ba : BrowserActions utility
+        """
         iframe = self.get_element("bookmark-iframe")
         ba.switch_to_iframe_context(iframe)
         # fill name
@@ -424,9 +430,11 @@ def open_add_bookmark_via_toolbar_other_bookmarks_context_menu(self) -> BasePage
     def delete_bookmark_from_other_bookmarks_via_context_menu(
         self, bookmark_name: str
     ) -> BasePage:
-        """Deletes a bookmark from Other Bookmarks via context menu.
+        """
+        Deletes a bookmark from Other Bookmarks via context menu.
         Argument:
-           bookmark_name: The display name of the bookmark to delete
+        ----------
+        bookmark_name: The display name of the bookmark to delete
         """
         self.click_on("other-bookmarks-toolbar")
         self.panel_ui.context_click("other-bookmarks-by-title", labels=[bookmark_name])
@@ -435,7 +443,12 @@ def delete_bookmark_from_other_bookmarks_via_context_menu(
 
     @BasePage.context_chrome
     def delete_bookmark_from_bookmarks_toolbar(self, bookmark_name: str) -> BasePage:
-        """Delete bookmark from bookmarks toolbar via context menu"""
+        """
+        Delete bookmark from bookmarks toolbar via context menu
+        Argument:
+        ----------
+        bookmark_name: The display name of the bookmark to delete
+        """
         self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_name])
         self.context_menu.click_and_hide_menu("context-menu-delete-page")
         return self
@@ -444,7 +457,12 @@ def delete_bookmark_from_bookmarks_toolbar(self, bookmark_name: str) -> BasePage
     def verify_bookmark_exists_in_toolbar_other_bookmarks_folder(
         self, bookmark_name: str
     ) -> BasePage:
-        """Verify bookmark exists in Other Bookmarks folder from toolbar"""
+        """
+        Verify bookmark exists in Other Bookmarks folder from toolbar
+        Arguments
+        ----------
+        bookmark_name : The exact name/title of the bookmark to search for in the Other Bookmarks folder.
+        """
         self.click_on("other-bookmarks-toolbar")  # Navigation selector
         self.panel_ui.element_visible(
             "other-bookmarks-by-title", labels=[bookmark_name]
@@ -455,15 +473,22 @@ def verify_bookmark_exists_in_toolbar_other_bookmarks_folder(
     def verify_bookmark_exists_in_bookmarks_toolbar(
         self, bookmark_name: str
     ) -> BasePage:
-        """Verify bookmark exists in the bookmarks toolbar"""
+        """
+        Verify bookmark exists in the bookmarks toolbar
+        """
         self.panel_ui.element_visible("bookmark-by-title", labels=[bookmark_name])
         return self
 
     @BasePage.context_chrome
     def verify_bookmark_does_not_exist_in_toolbar_other_bookmarks_folder(
         self, bookmark_name: str
     ) -> BasePage:
-        """Verify bookmark does not exist in Other Bookmarks folder from toolbar"""
+        """
+        Verify bookmark does not exist in Other Bookmarks folder from toolbar
+        Arguments
+        ----------
+        bookmark_name : The exact name/title of the bookmark to search for in the Other Bookmarks folder.
+        """
         self.click_on("other-bookmarks-toolbar")
         self.panel_ui.element_not_visible(
             "other-bookmarks-by-title", labels=[bookmark_name]
@@ -477,3 +502,45 @@ def verify_bookmark_does_not_exist_in_bookmarks_toolbar(
         """Verify bookmark does not exist in the bookmarks toolbar"""
         self.panel_ui.element_not_visible("bookmark-by-title", labels=[bookmark_name])
         return self
+
+    @BasePage.context_chrome
+    def edit_bookmark_via_star_button(self, new_name: str, location: str) -> BasePage:
+        """
+        Edit bookmark details by opening the edit bookmark panel via the star button
+        Arguments
+        ----------
+        new_name : str
+            The new name/title to assign to the bookmark
+        location : str
+            The folder location where the bookmark should be saved
+        """
+        self.click_on("star-button")
+        self.panel_ui.get_element("edit-bookmark-panel").send_keys(new_name)
+        if location == "Other Bookmarks":
+            self.panel_ui.click_on("bookmark-location")
+            self.panel_ui.click_on("other-bookmarks")
+        elif location == "Bookmarks Toolbar":
+            self.panel_ui.click_on("bookmark-location")
+            self.panel_ui.click_on("bookmarks-toolbar")
+        self.panel_ui.click_on("save-bookmark-button")
+        return self
+
+    @BasePage.context_chrome
+    def toggle_show_editor_when_saving(self) -> BasePage:
+        """
+        Toggle the show editor checkbox
+        """
+        self.click_on("star-button")
+        self.panel_ui.click_on("show-editor-when-saving-checkbox")
+        self.panel_ui.click_on("save-bookmark-button")
+        return self
+
+    @BasePage.context_chrome
+    def verify_edit_bookmark_panel_not_visible_after_navigation(self) -> BasePage:
+        """
+        Navigate to new URL and verify that edit bookmark panel is not visible when clicking star
+        Uses the exact same pattern as the working test
+        """
+        self.click_on("star-button")
+        self.panel_ui.element_not_visible("show-editor-when-saving-checkbox")
+        return self

modules/browser_object_panel_ui.py

@@ -14,6 +14,9 @@ class PanelUi(BasePage):
     """Browser Object Model for nav panel UI menu (hamburger menu, application menu)"""
 
     URL_TEMPLATE = "about:blank"
+    ENABLE_ADD_TAG = (
+        """PlacesUtils.tagging.tagURI(makeURI("https://www.github.com"), ["tag1"]);"""
+    )
 
     class Menu(Region):
         """
@@ -214,3 +217,45 @@ def verify_bookmark_exists_in_hamburger_menu(self, bookmark_title: str) -> BaseP
         """
         self.element_visible("bookmark-by-title", labels=[bookmark_title])
         return self
+
+    @BasePage.context_chrome
+    def enable_bookmark_tagging(self) -> BasePage:
+        """
+        Enable tagging functionality for bookmarks by executing a script
+        """
+        self.driver.execute_script(self.ENABLE_ADD_TAG)
+        return self
+
+    @BasePage.context_chrome
+    def edit_bookmark_from_hamburger_menu(
+        self, new_name: str, tags: str, location: str
+    ) -> BasePage:
+        """Edit bookmark details from hamburger menu"""
+        self.open_bookmarks_panel_from_hamburger_menu()
+        self.click_on("bookmark-current-tab")
+
+        # Edit bookmark details
+        self.get_element("edit-bookmark-panel").send_keys(new_name)
+        self.get_element("bookmark-tags").send_keys(tags)
+        if location == "Other Bookmarks":
+            self.click_on("bookmark-location")
+            self.click_on("other-bookmarks")
+        elif location == "Bookmarks Toolbar":
+            self.click_on("bookmark-location")
+            self.click_on("bookmarks-toolbar")
+        self.click_on("save-bookmark-button")
+
+    @BasePage.context_chrome
+    def get_bookmark_tags(self, tags: List[str]) -> List[str]:
+        """
+        Returns the actual bookmark tag values from the UI
+        """
+        self.open_bookmarks_panel_from_hamburger_menu()
+        self.click_on("bookmark-current-tab")
+        self.click_on("extend-bookmark-tags")
+        return [
+            self.get_element(f"{tag.lower().replace(' ', '')}-tag").get_attribute(
+                "value"
+            )
+            for tag in tags
+        ]

modules/data/navigation.components.json

@@ -284,12 +284,6 @@
         "groups": []
     },
 
-    "edit-bookmark-panel": {
-        "selectorData": "editBMPanel_namePicker",
-        "strategy": "id",
-        "groups": []
-    },
-
     "remove-bookmark-button": {
         "selectorData": "editBookmarkPanelRemoveButton",
         "strategy": "id",

modules/data/panel_ui.components.json

@@ -317,5 +317,11 @@
         "selectorData": "editBookmarkPanelDoneButton",
         "strategy": "id",
         "groups": []
+    },
+
+    "edit-bookmark-panel": {
+        "selectorData": "editBMPanel_namePicker",
+        "strategy": "id",
+        "groups": []
     }
 }

tests/bookmarks_and_history/test_add_new_other_bookmark.py

@@ -20,6 +20,7 @@ def test_add_new_other_bookmark(driver: Firefox):
     C2084518 - Verify another bookmark (with name, url, tag, keyword) can be added from other bookmarks toolbar
     context menu
     """
+    # Instantiate objects
     nav = Navigation(driver)
     ba = BrowserActions(driver)
     page = GenericPage(driver, url=BOOKMARK.url)

tests/bookmarks_and_history/test_bookmark_via_bookmark_menu.py

@@ -18,7 +18,7 @@ def test_bookmark_via_hamburger_menu(driver: Firefox):
     """
     C2084489: Verify that the user can bookmark a page using Bookmark current tab .. opened from Hamburger Menu
     """
-    # Instantiate object
+    # Instantiate objects
     panel = PanelUi(driver)
     page = GenericPage(driver, url=BOOKMARK_URL)
 

tests/bookmarks_and_history/test_bookmark_website_via_star_button.py

@@ -20,7 +20,7 @@ def test_bookmark_website_via_star(driver: Firefox):
     """
     C2084539: Verify that the Websites can be bookmarked via star-shaped button
     """
-    # Instantiate object
+    # Instantiate objects
     nav = Navigation(driver)
     panel = PanelUi(driver)
     page = GenericPage(driver, url=BOOKMARK_URL)

tests/bookmarks_and_history/test_delete_other_bookmarks.py

@@ -21,6 +21,7 @@ def test_delete_other_bookmarks(driver: Firefox):
     """
     C2084524 - Verify that a user can Delete a bookmark from 'Other Bookmarks' folder
     """
+    # Instantiate objects
     nav = Navigation(driver)
     page = GenericPage(driver, url=CACHE_PAGE_URL)
     ba = BrowserActions(driver)

tests/bookmarks_and_history/test_edit_bookmark_from_bookmark_menu.py

@@ -11,57 +11,38 @@ def test_case():
     return "2084490"
 
 
-URL_TO_BOOKMARK = "https://www.mozilla.org/"
-URL_TO_SAVE = "https://monitor.mozilla.org/"
-ENABLE_ADD_TAG = """
-            PlacesUtils.tagging.tagURI(makeURI("https://www.github.com"), ["tag1"]);
-        """
+BOOKMARK_URL = "https://www.mozilla.org/"
+BOOKMARK_NAME = "Mozilla Firefox"
+BOOKMARK_LOCATION = "Other Bookmarks"
+BOOKMARK_TAGS_STR = "Work, To do"
+BOOKMARK_TAGS_LIST = ["Work", "To do"]
 
 
 def test_edit_bookmark_from_bookmark_menu(driver: Firefox):
     """
     C2084490: Verify that the user can Edit a Bookmark from Bookmarks menu
     """
-    # instantiate object
+    # Instantiate objects
     nav = Navigation(driver)
     panel = PanelUi(driver)
+    page = GenericPage(driver, url=BOOKMARK_URL)
 
-    # Bookmark the given website via bookmarks menu
-    GenericPage(driver, url=URL_TO_BOOKMARK).open()
+    # Bookmark using Bookmark current tab option from Hamburger Menu
+    page.open()
     panel.open_bookmarks_panel_from_hamburger_menu()
-    nav.add_bookmark_via_star_icon()
+    panel.bookmark_current_tab_via_hamburger_menu()
 
-    with driver.context(driver.CONTEXT_CHROME):
-        # enable add a tag to a bookmark in the bookmark panel
-        driver.execute_script(ENABLE_ADD_TAG)
+    # Enable bookmark tagging functionality
+    panel.enable_bookmark_tagging()
 
-        # Open the Hamburger menu, click on the Edit This Bookmark button from the Bookmarks section
-        panel.open_bookmarks_panel_from_hamburger_menu()
-        panel.get_element("bookmark-current-tab").click()
+    # Edit bookmark details via Hamburger Menu
+    panel.edit_bookmark_from_hamburger_menu(
+        new_name=BOOKMARK_NAME, tags=BOOKMARK_TAGS_STR, location=BOOKMARK_LOCATION
+    )
 
-        # Change bookmark name, location and add a tag
-        nav.get_element("edit-bookmark-panel").send_keys("Mozilla Firefox")
-        panel.get_element("bookmark-tags").send_keys("Work, To do")
-        panel.get_element("bookmark-location").click()
-        panel.get_element("other-bookmarks").click()
-        nav.get_element("save-bookmark-button").click()
+    # Verify bookmark was moved to Other Bookmarks with correct name
+    nav.verify_bookmark_exists_in_toolbar_other_bookmarks_folder(BOOKMARK_NAME)
 
-        # Temporary fix before the other bookmarks issue is fixed
-        nav.get_element("star-button").click()
-        assert (
-            panel.get_element("bookmark-location").get_attribute("label")
-            == "Other Bookmarks"
-        )
-        # Check bookmark name and location are changed in the bookmarks toolbar
-        # panel.get_element("other-bookmarks-toolbar").click()
-        # panel.element_visible("other-bookmarks-by-title", labels=["Mozilla Firefox"])
-        # panel.get_element("other-bookmarks-toolbar").click()
-
-        # Check tags are correctly added and checked
-        panel.get_element("extend-bookmark-tags").click()
-        work_checkbox = panel.get_element("work-tag")
-        work_checked_attr = work_checkbox.get_attribute("checked")
-        assert work_checked_attr is None
-        todo_checkbox = panel.get_element("todo-tag")
-        todo_checked_attr = todo_checkbox.get_attribute("checked")
-        assert todo_checked_attr is None
+    # Verify bookmark tags are set correctly
+    actual_tags = panel.get_bookmark_tags(BOOKMARK_TAGS_LIST)
+    assert actual_tags == BOOKMARK_TAGS_LIST