Merge branch 'main' into Hani/address_doorhanger_captures_email_telephone

Author: Hani Yacoub

.github/workflows/check-beta.yml

@@ -11,10 +11,13 @@ permissions:
 jobs:
   Check-Beta-Version:
     runs-on: ubuntu-latest
+    outputs:
+      reportable: ${{ steps.reportable.outputs.test }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Check if the run is reportable
+        id: reportable
         env: 
           TESTRAIL_REPORT: true
           TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
@@ -23,8 +26,9 @@ jobs:
         run: |
           pip3 install 'pipenv==2023.11.15';
           pipenv install
-          pipenv run python -c 'from modules import testrail_integration as tri; import sys; sys.exit(0) if tri.reportable() else sys.exit(100)'
+          echo test=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable())') >> "$GITHUB_OUTPUT"
   Run-Smoke-Tests:
     needs: Check-Beta-Version
+    if: ${{ needs.Check-Beta-Version.outputs.reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
     secrets: inherit

SELECTOR_INFO.md

@@ -2849,6 +2849,13 @@ Location: Search mode of awesomebar
 Path to .json: modules/data/navigation.components.json
 ```
 ```
+Selector Name: contextual_search_button_awesome_bar
+Selector Data: "span.urlbarView-dynamic-actions-button-0.urlbarView-action-btn[data-action='matched-contextual-search']"
+Description: Contextual search button 
+Location: Address bar
+Path to .json: modules/data/navigation.components.json
+```
+```
 Selector Name: refresh-button-awesome-bar
 Selector Data: .urlbarView-action-btn[data-action=refresh]
 Description: Refresh button in the awesome bar

modules/browser_object_navigation.py

@@ -330,3 +330,8 @@ def open_searchmode_switcher_settings(self):
         self.click_on("searchmode-switcher")
         self.click_on("searchmode-switcher-settings")
         return self
+
+    def select_element_in_nav(self, element: str) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element(element).click()
+            return self

modules/data/navigation.components.json

@@ -150,8 +150,8 @@
     },
 
     "addon-suggestion": {
-        "selectorData": "div.urlbarView-row[type='rust_amo'] span.urlbarView-title.urlbarView-overflowable",
-        "strategy": "css",
+        "selectorData": "urlbarView-row-body",
+        "strategy": "class",
         "groups": []
     },
 
@@ -408,13 +408,13 @@
         "groups": []
     },
 
-     "bookmark-in-bar": {
+    "bookmark-in-bar": {
         "selectorData": "toolbarbutton.bookmark-item",
         "strategy": "css",
         "groups": []
     },
 
-     "popup-notification": {
+    "popup-notification": {
         "selectorData": "popupnotification",
         "strategy": "tag",
         "groups": []
@@ -456,13 +456,13 @@
         "groups": []
     },
 
-     "toolbar-history-clear-recent-history": {
+    "toolbar-history-clear-recent-history": {
         "selectorData": "appMenuClearRecentHistory",
         "strategy": "id",
         "groups": []
     },
 
-     "toolbar-history-recent_history": {
+    "toolbar-history-recent_history": {
         "selectorData": "panelMenu_recentHistory",
         "strategy": "id",
         "groups": []
@@ -478,7 +478,7 @@
         "selectorData": "menuitem[label='Gort! Klaatu barada nikto!']",
         "strategy": "css",
         "groups": []
-     },
+    },
 
     "password-notification-key": {
         "selectorData": "box#notification-popup-box image#password-notification-icon.notification-anchor-icon",
@@ -510,7 +510,6 @@
         "groups": []
     },
 
-
     "permissions-location-icon": {
         "selectorData": "permissions-granted-icon",
         "strategy": "id",
@@ -536,9 +535,9 @@
     },
 
     "permission-popup-audio-video-allowed": {
-            "selectorData": "#permission-popup-menulist[label='Allow Audio and Video']",
-            "strategy": "css",
-            "groups": []
+        "selectorData": "#permission-popup-menulist[label='Allow Audio and Video']",
+        "strategy": "css",
+        "groups": []
     },
 
     "block-audio-video-menuitem": {
@@ -548,40 +547,47 @@
     },
 
     "autoplay-icon-blocked": {
-            "selectorData": "blocked-permissions-container",
-            "strategy": "id",
-            "groups": []
+        "selectorData": "blocked-permissions-container",
+        "strategy": "id",
+        "groups": []
     },
 
     "toolbar-zoom-level": {
         "selectorData": "urlbar-zoom-button",
         "strategy": "id",
-         "groups": [
+        "groups": [
             "doNotCache"
         ]
     },
 
     "search-settings": {
         "selectorData": "urlbar-anon-search-settings",
         "strategy": "id",
-         "groups": []
+        "groups": []
     },
 
     "searchmode-switcher-settings": {
         "selectorData": "searchmode-switcher-popup-search-settings-button",
         "strategy": "id",
-         "groups": []
+
+        "groups": []
+    },
+
+    "contextual_search_button_awesome_bar": {
+        "selectorData": "span.urlbarView-dynamic-actions-button-0.urlbarView-action-btn[data-action='matched-contextual-search']",
+        "strategy": "css",
+        "groups": []
     },
 
     "refresh-button-awesome-bar": {
         "selectorData": ".urlbarView-action-btn[data-action=refresh]",
         "strategy": "css",
-         "groups": []
+        "groups": []
     },
 
     "refresh-firefox-dialog": {
         "selectorData": "window-modal-dialog",
         "strategy": "id",
-         "groups": []
+        "groups": []
     }
 }

taskcluster/kinds/new-beta-qa/kind.yml

@@ -39,7 +39,7 @@ tasks:
         pipenv install;
         ./collect_executables.sh;
         export FX_EXECUTABLE=./firefox/firefox;
-        pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 100;
+        pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
         $FX_EXECUTABLE --version;
         . ./keyring-unlock.sh
         pipenv run pytest --fx-executable $FX_EXECUTABLE -n 4 tests;

tests/address_bar_and_search/test_addon_suggestion.py

@@ -35,20 +35,14 @@ def test_addon_suggestion_based_on_search_input(driver: Firefox):
 
     nav = Navigation(driver)
     nav.set_awesome_bar()
-    sleep(20)
+    sleep(2)
 
-    with driver.context(driver.CONTEXT_CHROME):
-        nav.awesome_bar.click()
+    for input_text, addon_name in input_to_addon_name.items():
+        nav.type_in_awesome_bar(input_text)
+        nav.element_visible("addon-suggestion")
+        nav.select_element_in_nav("addon-suggestion")
 
-        for input_text, addon_name in input_to_addon_name.items():
-            nav.awesome_bar.send_keys(input_text)
-            nav.element_visible("addon-suggestion")
-            nav.get_element("addon-suggestion").click()
-
-            # Construct the expected URL
-            expected_url = (
-                f"https://addons.mozilla.org/en-US/firefox/addon/{addon_name}/"
-            )
-            nav.expect_in_content(EC.url_contains(expected_url))
-
-            nav.awesome_bar.clear()
+        # Construct the expected URL
+        expected_url = f"https://addons.mozilla.org/en-US/firefox/addon/{addon_name}/"
+        nav.expect_in_content(EC.url_contains(expected_url))
+        nav.clear_awesome_bar()

tests/address_bar_and_search/test_default_search_provider_change_awesome_bar.py

@@ -12,7 +12,6 @@ def test_case():
 
 
 @pytest.mark.ci
-@pytest.mark.skip("Scotch Bonnet")
 def test_default_search_provider_change_awesome_bar(driver: Firefox):
     """
     C2860208 - This test makes sure that the default search provider can be changed and settings are applied

tests/address_bar_and_search/test_preferences_all_toggles_enabled.py

@@ -49,10 +49,6 @@ def test_preferences_all_toggles_enabled(driver: Firefox):
                     for el in nav.get_elements("sponsored-suggestion")
                 ]
             )
-            logging.info(
-                "Label text:"
-                + nav.get_element("sponsored-suggestion").get_attribute("innerText")
-            )
         sleep(3)
         retries += 1
 

tests/address_bar_and_search/test_search_modes_for_sites.py

@@ -1,5 +1,6 @@
 import pytest
 from selenium.webdriver import Firefox
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 
 from modules.browser_object import Navigation
@@ -10,14 +11,29 @@ def test_case():
     return "2234690"
 
 
-sites = ["Google", "Amazon", "Bing", "DuckDuckGo", "eBay"]
+# Dictionary mapping search engines to their expected input prefix
+search_modes = {
+    # "Google": "Go", No longer testing Google if this is the default search engine, due to Scotch Bonnet changes
+    "Amazon": "Am",
+    "Bing": "Bi",
+    "DuckDuckGo": "Du",
+    "eBay": "Eb",
+}
 
 
-@pytest.mark.skip("Scotch Bonnet")
-@pytest.mark.parametrize("site", sites)
-def test_search_modes_for_sites(driver: Firefox, site: str):
-    """C2234690: Test that search modes can be activated. May also cover C1365213 eventually"""
+@pytest.mark.parametrize("site, prefix", search_modes.items())
+def test_search_modes_for_sites(driver: Firefox, site: str, prefix: str):
+    """C2234690: Test that search modes can be activated by typing the first two letters."""
     nav = Navigation(driver)
-    nav.search("soccer", mode=site)
+
+    # Type the first two letters into the Awesome Bar
+    nav.type_in_awesome_bar(prefix)
+
+    nav.click_on("contextual_search_button_awesome_bar")
+
+    # Perform the search
+    nav.type_in_awesome_bar("soccer" + Keys.ENTER)
+
+    # Validate that the correct search engine is used
     nav.expect_in_content(EC.url_contains(site.lower()))
     nav.clear_awesome_bar()

tests/address_bar_and_search/test_server_not_found_error.py

@@ -13,13 +13,13 @@ def test_case():
     return "1901393"
 
 
-CHECK_SITE = "http://cnn"
+CHECK_SITE = "http://example"
 SHORT_SITE = CHECK_SITE.split("/")[-1]
 
 ERROR_TITLES = ["Hmm. We’re having trouble finding that site."]
 
 
-def test_server_not_found_error(driver: Firefox):
+def test_server_not_found_error(driver: Firefox, version: str):
     """
     C1901393: - This tests that when a user navigates to a non-existent site, a "Server Not Found" error is
     displayed. The error page contains the correct elements, and the suggested link redirects to the appropriate page.
@@ -30,6 +30,9 @@ def test_server_not_found_error(driver: Firefox):
     tabs = TabBar(driver)
     error_page = ErrorPage(driver)
 
+    # Auto-detect if this is a Nightly build by checking the version string
+    is_nightly = any(identifier in version.lower() for identifier in ["a1", "nightly"])
+
     nav.search(CHECK_SITE)
 
     # Verify the tab title
@@ -38,35 +41,37 @@ def test_server_not_found_error(driver: Firefox):
     )
 
     # Verify elements on the error page
-    error_title = error_page.get_error_title()
-    assert (
-        error_title in ERROR_TITLES
-    ), f"Expected error title text not found. Actual: {error_title}"
-
-    error_short_description = error_page.get_error_short_description()
+    assert error_page.get_error_title() in ERROR_TITLES
     assert (
-        f"We can’t connect to the server at {SHORT_SITE}" in error_short_description
-    ), (
-        f"Expected error short description text not found."
-        f"Actual: {error_short_description}"
+        f"We can’t connect to the server at {SHORT_SITE}"
+        in error_page.get_error_short_description()
     )
 
-    error_long_description_items = error_page.get_error_long_description_items()
+    # Set the permission text based on what version is actually running
+    if is_nightly:
+        permission_message = (
+            "Check that Nightly has permission to access the web (you might be connected but behind "
+            "a firewall)"
+        )
+    else:
+        permission_message = (
+            "Check that Firefox has permission to access the web (you might be connected but behind "
+            "a firewall)"
+        )
+
     expected_texts = [
         "Try again later",
         "Check your network connection",
-        "Check that Firefox has permission to access the web (you might be connected but behind a firewall)",
+        permission_message,
     ]
 
-    for i, item in enumerate(error_long_description_items):
-        assert (
-            item.text == expected_texts[i]
-        ), f"Expected error long description item text not found. Actual: {item.text}"
+    for i, item in enumerate(error_page.get_error_long_description_items()):
+        assert item.text == expected_texts[i]
 
     WebDriverWait(driver, 30).until(
         lambda d: error_page.get_try_again_button().is_displayed()
     )
 
     # Verify that the suggested link redirects to the correct page
     error_page.get_error_suggestion_link().click()
-    nav.expect_in_content(EC.url_contains("https://www.cnn.com/"))
+    nav.expect_in_content(EC.url_contains("https://www.example.com/"))