Merge branch 'main' into Hani/refactor_pass_manager_batch1

Author: Hani Yacoub

tests/bookmarks_and_history/conftest.py

@@ -9,7 +9,7 @@ def suite_id():
 @pytest.fixture()
 def prefs_list(add_to_prefs_list: dict):
     """List of prefs to send to main conftest.py driver fixture"""
-    prefs = [("browser.toolbars.bookmarks.visibility", "Always")]
+    prefs = [("browser.toolbars.bookmarks.visibility", "always")]
     prefs.extend(add_to_prefs_list)
     return prefs
 

tests/bookmarks_and_history/test_edit_bookmark_from_bookmark_menu.py

@@ -18,6 +18,7 @@ def test_case():
         """
 
 
+@pytest.mark.unstable(reason="https://bugzilla.mozilla.org/show_bug.cgi?id=1963396")
 def test_edit_bookmark_from_bookmark_menu(driver: Firefox):
     """
     C2084490: Verify that the user can Edit a Bookmark from Bookmarks menu

tests/bookmarks_and_history/test_open_all_bookmarks_from_bookmarks_toolbar.py

@@ -38,7 +38,7 @@ def test_open_all_bookmarks_from_bookmarks_toolbar(driver: Firefox):
     GenericPage(driver, url=URL_NOT_BOOKMARKED).open()
 
     # Toggle bookmarks toolbar
-    nav.toggle_bookmarks_toolbar_with_key_combo()
+    # 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")

tests/bookmarks_and_history/test_toggle_bookmarks_toolbar.py

@@ -9,6 +9,11 @@ def test_case():
     return "2084637"
 
 
+@pytest.fixture()
+def add_to_prefs_list():
+    return [("browser.toolbars.bookmarks.visibility", "never")]
+
+
 def test_toggle_bookmark_toolbar(driver: Firefox):
     """
     C2084637: Verify that the user can Hide or Show the Bookmarks Toolbar using Keyboard shortcuts