Anca/Adaptive history records removal test + some refactoring (#929)

* Add adaptive hitory removal

* Update methods, add test to manifest

* Rename confusing selector

* Adjust selector

* Set failing test unstable

Author: soncuteanca

SELECTOR_INFO.md

@@ -1218,8 +1218,8 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 Selector Name: clipboard-suggestion-checkbox
 Selector Data: #clipboardSuggestion"
-Description: The checkbox for Clipboard 
-Location: about:preferences#search 
+Description: The checkbox for Clipboard
+Location: about:preferences#search
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
@@ -1254,7 +1254,7 @@ Path to .json: modules/data/about_prefs.components.json
 Selector Name: Browsing History
 Selector Data: history-suggestion
 Description: Browsing History / History Suggestion under Address bar section
-Location: about:preferences#search 
+Location: about:preferences#search
 Path to .json: modules/data/about_prefs.components.json
 ```
 #### about_profiles
@@ -3518,6 +3518,7 @@ Location: On the hamburger menu
 Path to .json: modules/data/panel_ui.components.json
 ```
 ```
+Selector name: panel-menu-item-by-title
 Selector Data: toolbarbutton.bookmark-item[label*='{title}']
 Description: Bookmark or history item by title. This selector works for both bookmarks and history items since Firefox uses the same CSS class "bookmark-item" for both in the hamburger menu UI.
 Location: On the hamburger menu > Bookmarks or History

manifests/key.yaml

@@ -6,6 +6,10 @@ address_bar_and_search:
       win: pass
     splits:
     - smoke
+  test_adaptive_history_removal:
+    result: pass
+    splits:
+    - functional1
   test_add_engine_address_bar:
     result: pass
     splits:
@@ -357,8 +361,8 @@ downloads:
   test_add_zip_type:
     result:
       linux: unstable
-      mac: pass
-      win: pass
+      mac: unstable
+      win: unstable
     splits:
     - smoke
     - ci-extended

modules/browser_object_navigation.py

@@ -727,14 +727,18 @@ def delete_bookmark_from_other_bookmarks_via_context_menu(
         return self
 
     @BasePage.context_chrome
-    def delete_bookmark_from_bookmarks_toolbar(self, bookmark_name: str) -> BasePage:
+    def delete_panel_menu_item_by_title(self, item_title: str) -> BasePage:
         """
-        Delete bookmark from bookmarks toolbar via context menu
+        Delete a panel menu item (bookmark or history entry) via context menu.
+
+        This method works for both bookmarks and history items in the panel menu (hamburger menu),
+        as Firefox uses the same UI structure for both. The caller should ensure the appropriate
+        panel menu is open (e.g., History menu or Bookmarks menu) before calling this method.
 
         Argument:
-        bookmark_name: The display name of the bookmark to delete
+            item_title: The display name/title of the item to delete (works for both bookmarks and history entries)
         """
-        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_name])
+        self.panel_ui.context_click("panel-menu-item-by-title", labels=[item_title])
         self.context_menu.click_and_hide_menu("context-menu-delete-page")
         return self
 
@@ -761,7 +765,9 @@ def verify_bookmark_exists_in_bookmarks_toolbar(
         """
         Verify bookmark exists in the bookmarks toolbar
         """
-        self.panel_ui.element_visible("bookmark-by-title", labels=[bookmark_name])
+        self.panel_ui.element_visible(
+            "panel-menu-item-by-title", labels=[bookmark_name]
+        )
         return self
 
     @BasePage.context_chrome
@@ -785,7 +791,9 @@ def verify_bookmark_does_not_exist_in_bookmarks_toolbar(
         self, bookmark_name: str
     ) -> BasePage:
         """Verify bookmark does not exist in the bookmarks toolbar"""
-        self.panel_ui.element_not_visible("bookmark-by-title", labels=[bookmark_name])
+        self.panel_ui.element_not_visible(
+            "panel-menu-item-by-title", labels=[bookmark_name]
+        )
         return self
 
     @BasePage.context_chrome
@@ -837,8 +845,10 @@ def open_bookmark_from_toolbar(self, bookmark_title: str) -> BasePage:
         Argument:
             bookmark_title: The title of the bookmark to open
         """
-        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
-        self.panel_ui.click_on("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.element_clickable(
+            "panel-menu-item-by-title", labels=[bookmark_title]
+        )
+        self.panel_ui.click_on("panel-menu-item-by-title", labels=[bookmark_title])
         return self
 
     @BasePage.context_chrome
@@ -852,8 +862,10 @@ def open_bookmark_in_new_tab_via_context_menu(
             bookmark_title: The title of the bookmark to open
         """
         # Right-click the bookmark and open it in new tabe via context menu item
-        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
-        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.element_clickable(
+            "panel-menu-item-by-title", labels=[bookmark_title]
+        )
+        self.panel_ui.context_click("panel-menu-item-by-title", labels=[bookmark_title])
         self.context_menu.click_on("context-menu-toolbar-open-in-new-tab")
 
         return self
@@ -868,8 +880,10 @@ def open_bookmark_in_new_window_via_context_menu(
         Argument:
             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.panel_ui.element_clickable(
+            "panel-menu-item-by-title", labels=[bookmark_title]
+        )
+        self.panel_ui.context_click("panel-menu-item-by-title", labels=[bookmark_title])
         self.context_menu.click_on("context-menu-toolbar-open-in-new-window")
         return self
 
@@ -883,8 +897,10 @@ def open_bookmark_in_new_private_window_via_context_menu(
         Argument:
             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.panel_ui.element_clickable(
+            "panel-menu-item-by-title", labels=[bookmark_title]
+        )
+        self.panel_ui.context_click("panel-menu-item-by-title", labels=[bookmark_title])
         self.context_menu.click_on("context-menu-toolbar-open-in-new-private-window")
         return self
 
@@ -1141,3 +1157,35 @@ def find_match(driver):
             return True
 
         return index
+
+    @BasePage.context_chrome
+    def verify_autofill_adaptive_element(
+        self, expected_type: str, expected_url: str
+    ) -> BasePage:
+        """
+        Verify that the adaptive history autofill element has the expected type and URL text.
+        This method handles chrome context switching internally.
+        Arguments:
+            expected_type: Expected type attribute value
+            expected_url: Expected URL fragment to be contained in the element text
+        """
+        autofill_element = self.get_element("search-result-autofill-adaptive-element")
+        actual_type = autofill_element.get_attribute("type")
+        actual_text = autofill_element.text
+
+        assert actual_type == expected_type
+        assert expected_url in actual_text
+
+        return self
+
+    @BasePage.context_chrome
+    def verify_no_autofill_adaptive_elements(self) -> BasePage:
+        autofill_elements = self.get_elements("search-result-autofill-adaptive-element")
+        if autofill_elements:
+            logging.warning(
+                f"Unexpected adaptive autofill elements found: {[el.text for el in autofill_elements]}"
+            )
+        assert len(autofill_elements) == 0, (
+            "Adaptive history autofill suggestion was not removed after deletion."
+        )
+        return self

modules/browser_object_panel_ui.py

@@ -282,32 +282,26 @@ def confirm_history_clear(self):
     def verify_history_item_exists(self, item_title: str) -> BasePage:
         """
         Verify that a history item with the specified title exists in the history menu.
-        Note:
-            This method uses the "bookmark-by-title" selector, which works for both
-            bookmarks and history items because Firefox uses the same CSS class "bookmark-item"
-            for both in the hamburger menu UI. This is intentional design in Firefox's UI.
+
         Argument:
             item_title (str): The title text to look for in the history item (can be partial match)
         """
         self.open_history_menu()
         self.get_all_history()
-        self.element_visible("bookmark-by-title", labels=[item_title])
+        self.element_visible("panel-menu-item-by-title", labels=[item_title])
         return self
 
     @BasePage.context_chrome
     def verify_history_item_does_not_exist(self, item_title: str) -> BasePage:
         """
-        Verify that a history item with the specified title exists in the history menu.
-        Note:
-            This method uses the "bookmark-by-title" selector, which works for both
-            bookmarks and history items because Firefox uses the same CSS class "bookmark-item"
-            for both in the hamburger menu UI. This is intentional design in Firefox's UI.
+        Verify that a history item with the specified title does not exist in the history menu.
+
         Argument:
             item_title (str): The title text to look for in the history item (can be partial match)
         """
         self.open_history_menu()
         self.get_all_history()
-        self.element_not_visible("bookmark-by-title", labels=[item_title])
+        self.element_not_visible("panel-menu-item-by-title", labels=[item_title])
         return self
 
     # Bookmarks section
@@ -338,7 +332,7 @@ def verify_bookmark_exists_in_hamburger_menu(self, bookmark_title: str) -> BaseP
         Arguments:
             bookmark_title (str): The title text to look for in the bookmark
         """
-        self.element_visible("bookmark-by-title", labels=[bookmark_title])
+        self.element_visible("panel-menu-item-by-title", labels=[bookmark_title])
         return self
 
     @BasePage.context_chrome

modules/data/panel_ui.components.json

@@ -180,7 +180,7 @@
         "groups": []
     },
 
-    "bookmark-by-title": {
+    "panel-menu-item-by-title": {
         "selectorData": "toolbarbutton.bookmark-item[label*='{title}']",
         "strategy": "css",
         "groups": []

tests/address_bar_and_search/test_adaptive_history_autofill.py

@@ -1,16 +1,14 @@
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.wait import WebDriverWait
 
 from modules.browser_object import Navigation
 from modules.browser_object_tabbar import TabBar
 
-WAIT_TIMEOUT = 10
 TEST_URL = "https://www.nationalgeographic.com/science/"
 EXPECTED_IN_TITLE = "Science"
+TYPED_TEXT = "nat"
 EXPECTED_TYPE = "autofill_adaptive"
-EXPECTED_TEXT_FRAGMENT = "nationalgeographic.com/science"
+EXPECTED_URL = "nationalgeographic.com/science"
 
 
 @pytest.fixture()
@@ -27,38 +25,26 @@ def test_add_adaptive_history_autofill(driver: Firefox):
     """
     C1814373 - Verify adaptive history autofill triggers from address bar input.
     """
+    # Instantiate objects
     nav = Navigation(driver)
     tabs = TabBar(driver)
 
-    # Step 1: Visit the test site and verify tab title
+    # Visit the test site and verify title
     nav.search(TEST_URL)
-    WebDriverWait(driver, WAIT_TIMEOUT).until(
-        lambda d: tabs.expect_title_contains(EXPECTED_IN_TITLE)
-    )
+    tabs.expect_title_contains(EXPECTED_IN_TITLE)
 
-    # Step 2: Open new tab, close the original
+    # Open new tab, close the original
     tabs.new_tab_by_button()
-    tabs.wait_for_num_tabs(2)
     driver.switch_to.window(driver.window_handles[1])
     tabs.close_first_tab_by_icon()
 
-    # Step 3: Type in address bar, then click adaptive suggestion
-    nav.type_in_awesome_bar("nat")
+    # Type in address bar, then click adaptive suggestion
+    nav.type_in_awesome_bar(TYPED_TEXT)
     nav.click_firefox_suggest()
-    nav.expect_in_content(EC.url_contains(TEST_URL))
+    nav.url_contains(TEST_URL)
 
-    # Step 4: Open new tab and check for autofill suggestion
+    # Open new tab and check for autofill suggestion
     tabs.new_tab_by_button()
-    tabs.wait_for_num_tabs(2)
     driver.switch_to.window(driver.window_handles[-1])
-    nav.type_in_awesome_bar("nat")
-
-    tabs.set_chrome_context()
-    autofill_element = nav.get_element("search-result-autofill-adaptive-element")
-
-    assert autofill_element.get_attribute("type") == EXPECTED_TYPE, (
-        f"Expected type '{EXPECTED_TYPE}', got '{autofill_element.get_attribute('type')}'"
-    )
-    assert EXPECTED_TEXT_FRAGMENT in autofill_element.text, (
-        f"Autofill text did not contain expected URL. Got: {autofill_element.text}"
-    )
+    nav.type_in_awesome_bar(TYPED_TEXT)
+    nav.verify_autofill_adaptive_element(EXPECTED_TYPE, EXPECTED_URL)

tests/address_bar_and_search/test_adaptive_history_removal.py

@@ -0,0 +1,64 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import Navigation
+from modules.browser_object_panel_ui import PanelUi
+from modules.browser_object_tabbar import TabBar
+
+TEST_URL = "https://www.nationalgeographic.com/science/"
+TYPED_TEXT = "nat"
+EXPECTED_IN_TITLE = "Science"
+EXPECTED_TYPE = "autofill_adaptive"
+EXPECTED_URL = "nationalgeographic.com/science"
+
+
+@pytest.fixture()
+def test_case():
+    return "3029071"
+
+
+@pytest.fixture()
+def add_to_prefs_list():
+    return [("browser.urlbar.autoFill.adaptiveHistory.enabled", True)]
+
+
+def test_remove_adaptive_history_entry(driver: Firefox) -> None:
+    """
+    C3029071 - Verify adaptive history entry is deleted from history and not suggested in address bar.
+    """
+    # Instantiate objects
+    nav = Navigation(driver)
+    tabs = TabBar(driver)
+    panel = PanelUi(driver)
+
+    # Visit the test site and verify title
+    nav.search(TEST_URL)
+    tabs.expect_title_contains(EXPECTED_IN_TITLE)
+
+    # Open new tab, close the original
+    tabs.new_tab_by_button()
+    driver.switch_to.window(driver.window_handles[1])
+    tabs.close_first_tab_by_icon()
+
+    # Type in address bar, then click adaptive suggestion
+    nav.type_in_awesome_bar(TYPED_TEXT)
+    nav.click_firefox_suggest()
+    nav.url_contains(TEST_URL)
+
+    # Open new tab and check for autofill suggestion
+    tabs.new_tab_by_button()
+    driver.switch_to.window(driver.window_handles[-1])
+    nav.type_in_awesome_bar(TYPED_TEXT)
+    nav.verify_autofill_adaptive_element(EXPECTED_TYPE, EXPECTED_URL)
+
+    # Delete the adaptive history entry
+    panel.open_history_menu()
+    nav.delete_panel_menu_item_by_title(EXPECTED_IN_TITLE)
+    panel.confirm_history_clear()
+
+    # Open new tab and verify the adaptive suggestion is removed
+    tabs.new_tab_by_button()
+    driver.switch_to.window(driver.window_handles[1])
+    tabs.close_first_tab_by_icon()
+    nav.type_in_awesome_bar(TYPED_TEXT)
+    nav.verify_no_autofill_adaptive_elements()

tests/bookmarks_and_history/test_delete_bookmarks_from_toolbar.py

@@ -30,7 +30,7 @@ def test_delete_bookmarks_from_toolbar(driver: Firefox):
     nav.verify_bookmark_exists_in_bookmarks_toolbar("Internet for people")
 
     # Delete the bookmark from toolbar
-    nav.delete_bookmark_from_bookmarks_toolbar("Internet for people")
+    nav.delete_panel_menu_item_by_title("Internet for people")
 
     # Verify bookmark was deleted
     nav.verify_bookmark_does_not_exist_in_bookmarks_toolbar("Internet for people")

tests/bookmarks_and_history/test_deleted_page_not_remembered.py

@@ -26,8 +26,7 @@ def test_deleted_page_not_remembered(driver: Firefox, sys_platform):
 
     # Open history menu and right-click on a specific history entry and delete it
     panel.open_history_menu()
-    panel.context_click("bookmark-by-title", labels=["Firefox Privacy Notice"])
-    context_menu.click_and_hide_menu("context-menu-delete-page")
+    nav.delete_panel_menu_item_by_title("Firefox Privacy Notice")
 
     # Type the deleted page name in the URL bar and verify the deleted page is not suggested
     nav.type_in_awesome_bar("Firefox Privacy Notice")