merge main, fix conflict

Author: ben-c-at-moz

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/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": {
@@ -73,5 +89,21 @@
         "selectorData": "//div[following-sibling::div[@class='section-top-bar']]",
         "strategy": "xpath",
         "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"
+        ]
     }
 }

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,27 +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",
+    "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