fix merge conflicts

Author: sarinali

modules/data/about_newtab.components.json

@@ -2,9 +2,7 @@
     "incontent-search-input": {
         "selectorData": "fake-editable",
         "strategy": "class",
-        "groups": [
-            "requiredForPage"
-        ]
+        "groups": []
     },
 
     "loaded-image": {
@@ -25,20 +23,40 @@
         "groups": []
     },
 
-    "top-sites-list": {
-        "selectorData": "top-sites-list",
+    "sponsored-site-card": {
+        "selectorData": "top-site-outer",
         "strategy": "class",
         "groups": [
-            "requiredForPage"
+            "requiredForPage",
+            "doNotCache"
         ]
     },
 
+    "top-site-image-by-index": {
+        "selectorData": ".top-sites-list li:nth-of-type({index}) .top-site-icon.rich-icon",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "sponsored-site-card-menu-button": {
+        "selectorData": "button[class=\"context-menu-button icon\"]",
+        "strategy": "css",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
+
+    "top-sites-list": {
+        "selectorData": "top-sites-list",
+        "strategy": "class",
+        "groups": []
+    },
+
     "recommended-by-pocket-list": {
         "selectorData": "ds-card-grid-include-descriptions",
         "strategy": "class",
-        "groups": [
-            "requiredForPage"
-        ]
+        "groups": []
     },
 
     "article-description": {
@@ -58,9 +76,7 @@
     "popular-topics-list": {
         "selectorData": ".ds-navigation > ul",
         "strategy": "css",
-        "groups": [
-            "requiredForPage"
-        ]
+        "groups": []
     },
 
     "recent-activity-section": {
@@ -75,6 +91,22 @@
         "groups": []
     },
 
+    "sponsored-site-context-menu": {
+        "selectorData": "context-menu",
+        "strategy": "class",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
+    "sponsored-site-context-menu-list": {
+        "selectorData": "ul[class=\"context-menu-list\"]",
+        "strategy": "css",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
     "body-logo": {
         "selectorData": "logo",
         "strategy": "class",

modules/data/about_prefs.components.json

@@ -135,6 +135,12 @@
         "groups": []
     },
 
+    "show-suggestions": {
+        "selectorData": "checkbox[data-l10n-id='search-show-suggestions-option']",
+        "strategy": "css",
+        "groups": []
+    },
+
     "firefox-suggest-nonsponsored": {
         "selectorData": "firefoxSuggestNonsponsored",
         "strategy": "id",

modules/data/navigation.components.json

@@ -169,9 +169,9 @@
     },
 
     "firefox-suggest": {
-    "selectorData": "div.urlbarView-row[label=\"Firefox Suggest\"] > span.urlbarView-row-inner",
-    "strategy": "css",
-    "groups": []
+        "selectorData": "div.urlbarView-row[label=\"Firefox Suggest\"] > span.urlbarView-row-inner",
+        "strategy": "css",
+        "groups": []
     },
 
     "search-result-autofill-adaptive-element": {
@@ -180,33 +180,9 @@
         "groups": []
     },
 
-    "sponsored-site-card": {
-        "selectorData": "top-site-outer",
-        "strategy": "class",
-        "groups": []
-    },
-
-    "sponsored-site-card-menu-button": {
-        "selectorData": "button[class=\"context-menu-button icon\"]",
-        "strategy": "css",
-        "groups": []
-    },
-
-    "sponsored-site-context-menu": {
-        "selectorData": "context-menu",
-        "strategy": "class",
-        "groups": []
-    },
-
-    "sponsored-site-context-menu-list": {
-        "selectorData": "ul[class=\"context-menu-list\"]",
-        "strategy": "css",
-        "groups": []
-    },
-
     "search-result": {
-    "selectorData": "//div[@data-text-ad]//a",
-    "strategy": "xpath",
-    "groups": []
+        "selectorData": "//div[@data-text-ad]//a",
+        "strategy": "xpath",
+        "groups": []
     }
 }

tests/address_bar_and_search/conftest.py

@@ -13,7 +13,17 @@ def httpserver_listen_address():
 
 
 @pytest.fixture()
-def set_prefs(add_prefs: dict):
+def add_prefs():
+    return []
+
+
+@pytest.fixture()
+def overwrite_prefs():
+    return []
+
+
+@pytest.fixture()
+def set_prefs(add_prefs: dict, overwrite_prefs):
     """Set prefs"""
     prefs = [
         ("browser.aboutConfig.showWarning", False),
@@ -25,8 +35,13 @@ def set_prefs(add_prefs: dict):
         ("browser.newtabpage.activity-stream.showSponsoredTopSites", True),
         ("browser.topsites.useRemoteSetting", True),
         ("browser.topsites.contile.enabled", True),
+        ("browser.search.region", "US"),
     ]
     prefs.extend(add_prefs)
+    for overwrite_pref in overwrite_prefs:
+        match = [pref for pref in prefs if pref[0] == overwrite_pref[0]]
+        if match:
+            prefs[prefs.index(match[0])] = overwrite_pref
     return prefs
 
 

tests/address_bar_and_search/test_adaptive_history_autofill.py

@@ -10,7 +10,6 @@
 @pytest.fixture()
 def add_prefs():
     return [
-        ("browser.search.region", "US"),
         ("browser.urlbar.autoFill.adaptiveHistory.enabled", True),
     ]
 
@@ -34,7 +33,7 @@ def test_add_adaptive_history_autofill(driver: Firefox):
     driver.switch_to.window(driver.window_handles[1])
 
     with driver.context(driver.CONTEXT_CHROME):
-        x_icon = tabs.get_element("tab-x-icon", multiple=True)
+        x_icon = tabs.get_elements("tab-x-icon")
         x_icon[0].click()
 
     # Type the first 3 characters of the visited URL in the address bar and select the suggested URL

tests/address_bar_and_search/test_add_engine_address_bar.py

@@ -8,14 +8,6 @@
 sites = [("YouTube", "com"), ("Ecosia", "org")]
 
 
-# Set search region
-@pytest.fixture()
-def add_prefs():
-    return [
-        ("browser.search.region", "US"),
-    ]
-
-
 @pytest.mark.unstable
 @pytest.mark.parametrize("site, domain", sites)
 def test_add_search_engine_from_address_bar(driver: Firefox, site: str, domain: str):

tests/address_bar_and_search/test_addon_suggestion.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -7,13 +7,6 @@
 from modules.browser_object import Navigation
 
 
-@pytest.fixture()
-def add_prefs():
-    return [
-        ("browser.search.region", "US"),
-    ]
-
-
 @pytest.mark.slow
 def test_addon_suggestion_based_on_search_input(driver: Firefox):
     """
@@ -37,9 +30,9 @@ def test_addon_suggestion_based_on_search_input(driver: Firefox):
     }
 
     nav = Navigation(driver).open()
-    time.sleep(20)
+    sleep(20)
     nav.set_awesome_bar()
-    time.sleep(20)
+    sleep(20)
     nav.awesome_bar.click()
 
     for input_text, addon_name in input_to_addon_name.items():

tests/address_bar_and_search/test_default_search_provider_change.py

@@ -1,20 +1,12 @@
 from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 
 from modules.browser_object import Navigation
 from modules.page_object import AboutConfig, AboutPrefs
 
 
-@pytest.fixture()
-def add_prefs():
-    return [
-        ("browser.search.region", "US"),
-    ]
-
-
 def test_default_search_provider_change(driver: Firefox):
     """
     C1365245 - This test makes sure that the default search

tests/address_bar_and_search/test_glean_basic.py

@@ -18,14 +18,6 @@
 PING_ID = ""
 
 
-# Set search region
-@pytest.fixture()
-def add_prefs():
-    return [
-        ("browser.search.region", "US"),
-    ]
-
-
 def confirm_glean_correctness(
     ping_ground: str, ping_test: str, engine_ground: str, engine_test: str
 ) -> bool:

tests/address_bar_and_search/test_google_search_counts_us.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -8,13 +8,6 @@
 from modules.util import Utilities
 
 
-@pytest.fixture()
-def add_prefs():
-    return [
-        ("browser.search.region", "US"),
-    ]
-
-
 # unstable: for some reason cannot pass in Taskcluster Linux VM
 @pytest.mark.unstable
 def test_google_search_counts_us(driver: Firefox):
@@ -24,7 +17,7 @@ def test_google_search_counts_us(driver: Firefox):
     # instantiate objects
     nav = Navigation(driver).open()
     nav.search("festival")
-    time.sleep(5)
+    sleep(5)
     about_telemetry = AboutTelemetry(driver).open()
     u = Utilities()