Merge pull request #594 from mozilla/as/fix-add-new-other-bookmark-from-context-menu

Anca/ Test stabilization - Fix Win failures for Other Bookmarks

Author: soncuteanca

modules/browser_object_navigation.py

@@ -344,26 +344,24 @@ def bookmark_page_other(self) -> BasePage:
         return self
 
     @BasePage.context_chrome
-    def add_bookmark_advanced(
+    def add_bookmark_via_other_bookmark_context_menu(
         self, bookmark_data: Bookmark, ba: BrowserActions
     ) -> BasePage:
         iframe = self.get_element("bookmark-iframe")
         ba.switch_to_iframe_context(iframe)
         # fill name
-        if bookmark_data.name is not None:
-            self.actions.send_keys(bookmark_data.name).perform()
+        self.actions.send_keys(bookmark_data.name).perform()
         self.actions.send_keys(Keys.TAB).perform()
         # fill url
         self.actions.send_keys(bookmark_data.url + Keys.TAB).perform()
         # fill tags
-        if bookmark_data.tags is not None:
-            self.actions.send_keys(bookmark_data.tags).perform()
+        self.actions.send_keys(bookmark_data.tags).perform()
+        self.actions.send_keys(Keys.TAB).perform()
         self.actions.send_keys(Keys.TAB).perform()
         # fill keywords
-        if bookmark_data.keyword is not None:
-            self.actions.send_keys(bookmark_data.keyword).perform()
-        self.actions.send_keys(Keys.TAB, Keys.TAB, Keys.TAB, Keys.ENTER).perform()
-        ba.switch_to_content_context()
+        self.actions.send_keys(bookmark_data.keyword).perform()
+        # save the bookmark
+        self.actions.send_keys(Keys.ENTER).perform()
         return self
 
     @BasePage.context_chrome

tests/bookmarks_and_history/test_add_new_other_bookmark.py

@@ -1,6 +1,3 @@
-import sys
-from os import environ
-
 import pytest
 from selenium.webdriver import Firefox
 
@@ -16,25 +13,26 @@ def test_case():
 
 
 BOOKMARK_URL = "about:robots"
+BOOKMARK_NAME = "Robots 2"
+BOOKMARK_TAGS = "a"
+BOOKMARK_KEYBOARD = "about"
 
 
-WIN_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("win")
-
-
-@pytest.mark.skipif(WIN_GHA, reason="Test unstable in Windows Github Actions")
 def test_add_new_other_bookmark(driver: Firefox):
     """
-    C2084518: verify user can add another bookmark from other bookmarks
+    C2084518 - Verify another bookmark (with name, url, tag, keyboard) can be added from other bookmarks toolbar
+    context menu
     """
     nav = Navigation(driver)
     ba = BrowserActions(driver)
-    GenericPage(driver, url=BOOKMARK_URL).open()
+    page = GenericPage(driver, url=BOOKMARK_URL)
     context_menu = ContextMenu(driver)
 
-    # create a bookmark for other
+    # Create the first bookmark in Other Bookmarks folder
+    page.open()
     nav.bookmark_page_other()
 
-    # get other bookmarks
+    # Create a new bookmark from Other Bookmark context menu
     with driver.context(driver.CONTEXT_CHROME):
         nav.get_element("other-bookmarks").click()
         nav.context_click("other-bookmarks-popup")
@@ -43,8 +41,11 @@ def test_add_new_other_bookmark(driver: Firefox):
         context_menu.hide_popup_by_child_node("context-menu-add-bookmark")
         nav.hide_popup("OtherBookmarksPopup")
 
-    nav.add_bookmark_advanced(Bookmark(url="about:robots", name="Robots 2"), ba)
+        nav.add_bookmark_via_other_bookmark_context_menu(
+            Bookmark(BOOKMARK_URL, BOOKMARK_NAME, BOOKMARK_TAGS, BOOKMARK_KEYBOARD), ba
+        )
 
+    # Verify the presence of the second added bookmarked page
     with driver.context(driver.CONTEXT_CHROME):
         nav.get_element("other-bookmarks").click()
         nav.element_visible("bookmark-robots")

tests/bookmarks_and_history/test_delete_other_bookmarks.py

@@ -1,6 +1,3 @@
-import sys
-from os import environ
-
 import pytest
 from selenium.webdriver import Firefox
 
@@ -11,30 +8,30 @@
 
 BOOKMARK_URL = "about:robots"
 BOOKMARK_URL_2 = "about:cache"
-
-
-WIN_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("win")
+BOOKMARK_NAME = "Cache"
+BOOKMARK_TAGS = "a"
+BOOKMARK_KEYBOARD = "about"
 
 
 @pytest.fixture()
 def test_case():
     return "2084524"
 
 
-@pytest.mark.skipif(WIN_GHA, reason="Test unstable in Windows Github Actions")
 def test_delete_other_bookmarks(driver: Firefox):
     """
-    C2084524: Verify that a user can Delete a bookmark from 'Other Bookmarks' folder
+    C2084524 - Verify that a user can Delete a bookmark from 'Other Bookmarks' folder
     """
     nav = Navigation(driver)
-    GenericPage(driver, url=BOOKMARK_URL).open()
+    page = GenericPage(driver, url=BOOKMARK_URL)
     ba = BrowserActions(driver)
     context_menu = ContextMenu(driver)
 
-    # create the first bookmark for other
+    # Create the first bookmark in Other Bookmarks folder
+    page.open()
     nav.bookmark_page_other()
 
-    # get other bookmarks
+    # Create a new bookmark from Other Bookmark context menu
     with driver.context(driver.CONTEXT_CHROME):
         nav.get_element("other-bookmarks").click()
         nav.context_click("other-bookmarks-popup")
@@ -43,10 +40,11 @@ def test_delete_other_bookmarks(driver: Firefox):
         context_menu.hide_popup_by_child_node("context-menu-add-bookmark")
         nav.hide_popup("OtherBookmarksPopup")
 
-    # add second bookmark
-    nav.add_bookmark_advanced(Bookmark(url=BOOKMARK_URL_2, name="Cache"), ba)
+    nav.add_bookmark_via_other_bookmark_context_menu(
+        Bookmark(BOOKMARK_URL_2, BOOKMARK_NAME, BOOKMARK_TAGS, BOOKMARK_KEYBOARD), ba
+    )
 
-    # delete first bookmark and verify it's not present anymore
+    # Delete the first bookmark and verify it's not present anymore
     with driver.context(driver.CONTEXT_CHROME):
         nav.get_element("other-bookmarks").click()
         nav.context_click("bookmark-about-robots")