merge changes in

Author: sarinali

modules/browser_object_navigation.py

@@ -37,6 +37,15 @@ def get_awesome_bar(self) -> WebElement:
         self.set_awesome_bar()
         return self.awesome_bar
 
+    def get_awesome_bar_text(self):
+        """
+        Get the text directly from the awesome bar.
+        This is different from 'driver.current_url' which pulls from href
+        """
+        self.set_chrome_context()
+        awesome_bar = self.get_element("awesome-bar").get_attribute("value")
+        return awesome_bar
+
     def clear_awesome_bar(self) -> BasePage:
         """Clear the Awesome Bar. Prefer this over get_element("awesome-bar").clear()"""
         self.set_awesome_bar()

modules/browser_object_tabbar.py

@@ -106,6 +106,13 @@ def expect_tab_sound_status(
             )
         return self
 
+    def expect_title_contains(self, text: str) -> BasePage:
+        """
+        Check if the page title contains given text
+        """
+        self.expect(EC.title_contains(text))
+        return self
+
     def open_all_tabs_list(self) -> BasePage:
         """Click the Tab Visibility / List All Tabs button"""
         with self.driver.context(self.driver.CONTEXT_CHROME):

modules/data/about_config.components.json

@@ -11,5 +11,17 @@
         "selectorData": "about-config-search",
         "strategy": "id",
         "groups": []
+    },
+
+    "cell-edit": {
+        "selectorData": "cell-edit",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "form-edit": {
+        "selectorData": "//input[@aria-label='cookiebanners.service.mode']",
+        "strategy": "xpath",
+        "groups": []
     }
 }

modules/data/navigation.components.json

@@ -202,5 +202,11 @@
         "selectorData": "ul[class=\"context-menu-list\"]",
         "strategy": "css",
         "groups": []
+    },
+
+    "search-result": {
+    "selectorData": "//div[@data-text-ad]//a",
+    "strategy": "xpath",
+    "groups": []
     }
 }

modules/page_object_about_config.py

@@ -38,3 +38,14 @@ def toggle_true_false_config(self, term: str) -> BasePage:
         self.search_pref(term)
         self.toggle_true_false()
         return self
+
+    def change_pref_value(self, term: str, value) -> BasePage:
+        self.set_content_context()
+        self.driver.get("about:config")
+        self.search_pref(term)
+        pref_edit_button = self.get_element("cell-edit")
+        pref_edit_button.click()
+        pref_edit = self.get_element("form-edit")
+        pref_edit.send_keys(value)
+        pref_edit_button.click()
+        return self

tests/address_bar_and_search/test_google_withads_url_bar_us.py

@@ -0,0 +1,40 @@
+import time
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import Navigation
+from modules.page_object import AboutTelemetry
+from modules.page_object_about_config import AboutConfig
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def add_prefs():
+    return [("browser.search.region", "US"), ("cookiebanners.service.mode", 1)]
+
+
+def test_google_withads_url_bar_us(driver: Firefox):
+    """
+    C1365070, verify that Google withads URL bar - US is recorder into telemetry
+    """
+
+    # instantiate objects
+    nav = Navigation(driver).open()
+    util = Utilities()
+
+    nav.search("iphone")
+    time.sleep(5)
+    about_telemetry = AboutTelemetry(driver).open()
+    time.sleep(2)
+
+    # Click on Raw JSON, switch tab and click on Raw Data
+    about_telemetry.get_element("category-raw").click()
+    about_telemetry.switch_tab()
+    about_telemetry.get_element("rawdata-tab").click()
+
+    # Verify the following ping is recorded: ""browser.search.withads.urlbar": { "google:tagged": 1}".
+    json_data = util.decode_url(driver)
+    assert util.assert_json_value(
+        json_data, '$..["browser.search.withads.urlbar"].["google:tagged"]', 1
+    )

tests/address_bar_and_search/test_sap_google_adclick.py

@@ -0,0 +1,50 @@
+import logging
+import time
+
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_navigation import Navigation
+from modules.page_object_about_config import AboutConfig
+from modules.page_object_about_telemetry import AboutTelemetry
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("browser.search.region", "US"),
+    ]
+
+
+def test_sap_google_adclick(driver: Firefox):
+    """
+    C1365108, Test SAP Google adclick - URL bar - US
+    """
+    # instantiate objects
+    nav = Navigation(driver).open()
+    about_config = AboutConfig(driver)
+    u = Utilities()
+
+    # change pref value in order to not display accept cookies banner
+    about_config.change_pref_value("cookiebanners.service.mode", 1)
+
+    # search and click on an ad
+    nav.search("iphone")
+    nav.get_element("search-result").click()
+    time.sleep(2)
+
+    # Click on Raw JSON, switch tab and click on Raw Data
+    about_telemetry = AboutTelemetry(driver).open()
+    time.sleep(2)
+    about_telemetry.get_element("category-raw").click()
+    about_telemetry.switch_tab()
+    about_telemetry.get_element("rawdata-tab").click()
+
+    # Verify pings are recorded
+    json_data = u.decode_url(driver)
+    assert u.assert_json_value(
+        json_data,
+        '$..keyedScalars.["browser.search.adclicks.urlbar"].["google:tagged"]',
+        1,
+    )

tests/address_bar_and_search/test_search_bar_result.py

@@ -1,9 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
 
-from modules.browser_object import Navigation
+from modules.browser_object import Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -14,6 +13,11 @@ def add_prefs():
     ]
 
 
+# Set constants
+SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
+SEARCH_TERM = "saxophone"
+
+
 def test_search_bar_results(driver: Firefox):
     """
     C1365213 - The Search Bar provides valid results for specific search terms
@@ -22,21 +26,19 @@ def test_search_bar_results(driver: Firefox):
     # Create objects
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
-
-    search_term = "saxophone"
+    tab = TabBar(driver)
 
     # Check Google results from a Search bar search
     # First enable search bar via about:config
-    pref = "browser.search.widget.inNavBar"
-    ac.toggle_true_false_config(pref)
+    ac.toggle_true_false_config(SEARCH_BAR_PREF)
     nav.clear_awesome_bar()
 
     # Then run search and check the results
-    nav.search_bar_search(search_term)
+    nav.search_bar_search(SEARCH_TERM)
     nav.set_content_context()
-    nav.expect_in_content(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_url = driver.current_url
-    assert search_term in search_url
+    assert SEARCH_TERM in search_url
     content_searchbar = nav.find_element(By.NAME, "q")
     content_searchbar_text = content_searchbar.get_attribute("value")
-    assert content_searchbar_text == search_term
+    assert content_searchbar_text == SEARCH_TERM

tests/address_bar_and_search/test_search_code_google_non_us.py

@@ -1,9 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as ec
 
-from modules.browser_object import ContextMenu, Navigation
+from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -15,6 +14,11 @@ def add_prefs():
     ]
 
 
+# Set constants
+FX_SEARCH_CODE = "client=firefox-b-d"
+SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
+
+
 def test_search_code_google_us(driver: Firefox):
     """
     C1365269 - Default Search Code: Google - non-US
@@ -26,29 +30,28 @@ def test_search_code_google_us(driver: Firefox):
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
+    tab = TabBar(driver)
 
     def search_code_assert():
         # Function to check the search code of a Google search in US region
-        fx_code = "client=firefox-b-d"
         nav.set_content_context()
         search_url = driver.current_url
-        assert fx_code in search_url
+        assert FX_SEARCH_CODE in search_url
         nav.clear_awesome_bar()
 
     # Check code generated from the Awesome bar search
     nav.search("soccer")
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the Search bar search
     # First enable search bar via about:config
-    pref = "browser.search.widget.inNavBar"
-    ac.toggle_true_false_config(pref)
+    ac.toggle_true_false_config(SEARCH_BAR_PREF)
     nav.clear_awesome_bar()
 
     # Then run the code check
     nav.search_bar_search("soccer")
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the context click of selected text
@@ -64,5 +67,5 @@ def search_code_assert():
     # Switch to the newly opened tab and run the code check
     window_handles = driver.window_handles
     driver.switch_to.window(window_handles[-1])
-    nav.expect(ec.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()

tests/address_bar_and_search/test_search_code_google_us.py

@@ -3,7 +3,7 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
-from modules.browser_object import ContextMenu, Navigation
+from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import AboutConfig
 
 
@@ -15,6 +15,11 @@ def add_prefs():
     ]
 
 
+# Set constant
+FX_SEARCH_CODE = "client=firefox-b-1-d"
+SEARCH_BAR_PREF = "browser.search.widget.inNavBar"
+
+
 def test_search_code_google_us(driver: Firefox):
     """
     C1365268 - Default Search Code: Google - US
@@ -26,13 +31,13 @@ def test_search_code_google_us(driver: Firefox):
     nav = Navigation(driver).open()
     ac = AboutConfig(driver)
     context_menu = ContextMenu(driver)
+    tab = TabBar(driver)
 
     def search_code_assert():
         # Function to check the search code of a Google search in US region
-        fx_code = "client=firefox-b-1-d"
         nav.set_content_context()
         search_url = driver.current_url
-        assert fx_code in search_url
+        assert FX_SEARCH_CODE in search_url
         nav.clear_awesome_bar()
 
     # Check code generated from the Awesome bar search
@@ -42,13 +47,12 @@ def search_code_assert():
 
     # Check code generated from the Search bar search
     # First enable search bar via about:config
-    pref = "browser.search.widget.inNavBar"
-    ac.toggle_true_false_config(pref)
+    ac.toggle_true_false_config(SEARCH_BAR_PREF)
     nav.clear_awesome_bar()
 
     # Then run the code check
     nav.search_bar_search("soccer")
-    nav.expect(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()
 
     # Check code generated from the context click of selected text
@@ -64,5 +68,5 @@ def search_code_assert():
     # Switch to the newly opened tab and run the code check
     window_handles = driver.window_handles
     driver.switch_to.window(window_handles[-1])
-    nav.expect(EC.title_contains("Google Search"))
+    tab.expect_title_contains("Google Search")
     search_code_assert()