summaryrefslogtreecommitdiffstats
path: root/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js
diff options
context:
space:
mode:
Diffstat (limited to 'browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js')
-rw-r--r--browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js269
1 files changed, 191 insertions, 78 deletions
diff --git a/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js b/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js
index 6a3422d939..bea266dbf4 100644
--- a/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js
+++ b/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js
@@ -13,6 +13,7 @@
ChromeUtils.defineESModuleGetters(this, {
UrlbarProviderClipboard:
"resource:///modules/UrlbarProviderClipboard.sys.mjs",
+ SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
// This test has many subtests and can time out in verify mode.
@@ -23,7 +24,7 @@ add_setup(async function () {
});
add_task(async function selected_result_autofill_about() {
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("about:about");
await doEnter();
@@ -44,7 +45,7 @@ add_task(async function selected_result_autofill_adaptive() {
set: [["browser.urlbar.autoFill.adaptiveHistory.enabled", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesTestUtils.addVisits("https://example.com/test");
await UrlbarUtils.addToInputHistory("https://example.com/test", "exa");
await openPopup("exa");
@@ -65,7 +66,7 @@ add_task(async function selected_result_autofill_adaptive() {
});
add_task(async function selected_result_autofill_origin() {
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesTestUtils.addVisits("https://example.com/test");
await PlacesFrecencyRecalculator.recalculateAnyOutdatedFrecencies();
await openPopup("exa");
@@ -84,7 +85,7 @@ add_task(async function selected_result_autofill_origin() {
});
add_task(async function selected_result_autofill_url() {
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesTestUtils.addVisits("https://example.com/test");
await PlacesFrecencyRecalculator.recalculateAnyOutdatedFrecencies();
await openPopup("https://example.com/test");
@@ -103,7 +104,7 @@ add_task(async function selected_result_autofill_url() {
});
add_task(async function selected_result_bookmark() {
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesUtils.bookmarks.insert({
parentGuid: PlacesUtils.bookmarks.unfiledGuid,
url: "https://example.com/bookmark",
@@ -131,7 +132,7 @@ add_task(async function selected_result_history() {
set: [["browser.urlbar.autoFill", false]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesTestUtils.addVisits("https://example.com/test");
await openPopup("example");
@@ -153,7 +154,7 @@ add_task(async function selected_result_history() {
});
add_task(async function selected_result_keyword() {
- await doTest(async browser => {
+ await doTest(async () => {
await PlacesUtils.keywords.insert({
keyword: "keyword",
url: "https://example.com/?q=%s",
@@ -177,7 +178,7 @@ add_task(async function selected_result_keyword() {
});
add_task(async function selected_result_search_engine() {
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("x");
await doEnter();
@@ -201,7 +202,7 @@ add_task(async function selected_result_search_suggest() {
],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("foo");
await selectRowByURL("http://mochi.test:8888/?terms=foofoo");
await doEnter();
@@ -228,7 +229,7 @@ add_task(async function selected_result_search_history() {
],
});
- await doTest(async browser => {
+ await doTest(async () => {
await UrlbarTestUtils.formHistory.add(["foofoo", "foobar"]);
await openPopup("foo");
@@ -250,7 +251,7 @@ add_task(async function selected_result_search_history() {
});
add_task(async function selected_result_url() {
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("https://example.com/");
await doEnter();
@@ -267,7 +268,7 @@ add_task(async function selected_result_url() {
});
add_task(async function selected_result_action() {
- await doTest(async browser => {
+ await doTest(async () => {
await showResultByArrowDown();
await selectRowByProvider("quickactions");
const onLoad = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
@@ -289,7 +290,7 @@ add_task(async function selected_result_action() {
add_task(async function selected_result_tab() {
const tab = BrowserTestUtils.addTab(gBrowser, "https://example.com/");
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("example");
await selectRowByProvider("Places");
EventUtils.synthesizeKey("KEY_Enter");
@@ -312,7 +313,7 @@ add_task(async function selected_result_tab() {
add_task(async function selected_result_remote_tab() {
const remoteTab = await loadRemoteTab("https://example.com");
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("example");
await selectRowByProvider("RemoteTabs");
await doEnter();
@@ -335,7 +336,7 @@ add_task(async function selected_result_addon() {
const addon = loadOmniboxAddon({ keyword: "omni" });
await addon.startup();
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("omni test");
await doEnter();
@@ -363,7 +364,7 @@ add_task(async function selected_result_tab_to_search() {
search_url: "https://mozengine/",
});
- await doTest(async browser => {
+ await doTest(async () => {
for (let i = 0; i < 3; i++) {
await PlacesTestUtils.addVisits(["https://mozengine/"]);
}
@@ -389,7 +390,7 @@ add_task(async function selected_result_tab_to_search() {
});
add_task(async function selected_result_top_site() {
- await doTest(async browser => {
+ await doTest(async () => {
await addTopSites("https://example.com/");
await showResultByArrowDown();
await selectRowByURL("https://example.com/");
@@ -412,7 +413,7 @@ add_task(async function selected_result_calc() {
set: [["browser.urlbar.suggest.calculator", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("8*8");
await selectRowByProvider("calculator");
await SimpleTest.promiseClipboardChange("64", () => {
@@ -444,7 +445,7 @@ add_task(async function selected_result_clipboard() {
"https://example.com/selected_result_clipboard"
);
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("");
await selectRowByProvider("UrlbarProviderClipboard");
await doEnter();
@@ -470,7 +471,7 @@ add_task(async function selected_result_unit() {
set: [["browser.urlbar.unitConversion.enabled", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("1m to cm");
await selectRowByProvider("UnitConversion");
await SimpleTest.promiseClipboardChange("100 cm", () => {
@@ -496,7 +497,7 @@ add_task(async function selected_result_site_specific_contextual_search() {
set: [["browser.urlbar.contextualSearch.enabled", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
const extension = await SearchTestUtils.installSearchExtension(
{
name: "Contextual",
@@ -540,7 +541,7 @@ add_task(async function selected_result_rs_adm_sponsored() {
prefs: [["quicksuggest.rustEnabled", false]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("sponsored");
await selectRowByURL("https://example.com/sponsored");
await doEnter();
@@ -564,7 +565,7 @@ add_task(async function selected_result_rs_adm_nonsponsored() {
prefs: [["quicksuggest.rustEnabled", false]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("nonsponsored");
await selectRowByURL("https://example.com/nonsponsored");
await doEnter();
@@ -594,13 +595,13 @@ add_task(async function selected_result_input_field() {
},
];
- await doTest(async browser => {
+ await doTest(async () => {
await doDropAndGo("example.com");
assertEngagementTelemetry(expected);
});
- await doTest(async browser => {
+ await doTest(async () => {
await doPasteAndGo("example.com");
assertEngagementTelemetry(expected);
@@ -618,7 +619,7 @@ add_task(async function selected_result_weather() {
let provider = UrlbarPrefs.get("quickSuggestRustEnabled")
? "UrlbarProviderQuickSuggest"
: "Weather";
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup(MerinoTestUtils.WEATHER_KEYWORD);
await selectRowByProvider(provider);
await doEnter();
@@ -653,7 +654,7 @@ add_task(async function selected_result_navigational() {
],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("only match the Merino suggestion");
await selectRowByProvider("UrlbarProviderQuickSuggest");
await doEnter();
@@ -688,7 +689,7 @@ add_task(async function selected_result_dynamic_wikipedia() {
],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("only match the Merino suggestion");
await selectRowByProvider("UrlbarProviderQuickSuggest");
await doEnter();
@@ -708,7 +709,7 @@ add_task(async function selected_result_dynamic_wikipedia() {
});
add_task(async function selected_result_search_shortcut_button() {
- await doTest(async browser => {
+ await doTest(async () => {
const oneOffSearchButtons = UrlbarTestUtils.getOneOffSearchButtons(window);
await openPopup("x");
Assert.ok(!oneOffSearchButtons.selectedButton);
@@ -756,31 +757,78 @@ add_task(async function selected_result_trending() {
});
let defaultEngine = await Services.search.getDefault();
- let extension = await SearchTestUtils.installSearchExtension(
- {
- name: "mozengine",
- search_url: "https://example.org/",
- },
- { setAsDefault: true, skipUnload: true }
- );
+ let extension;
+ if (!SearchUtils.newSearchConfigEnabled) {
+ extension = await SearchTestUtils.installSearchExtension(
+ {
+ name: "mozengine",
+ search_url: "https://example.org/",
+ },
+ { setAsDefault: true, skipUnload: true }
+ );
+ }
SearchTestUtils.useMockIdleService();
- await SearchTestUtils.updateRemoteSettingsConfig([
- {
- webExtension: { id: "mozengine@tests.mozilla.org" },
- urls: {
- trending: {
- fullPath:
- "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs",
- query: "",
- },
- },
- appliesTo: [{ included: { everywhere: true } }],
- default: "yes",
- },
- ]);
+ await SearchTestUtils.updateRemoteSettingsConfig(
+ SearchUtils.newSearchConfigEnabled
+ ? [
+ {
+ recordType: "engine",
+ identifier: "mozengine",
+ base: {
+ name: "mozengine",
+ urls: {
+ search: {
+ base: "https://example.org/",
+ searchTermParamName: "q",
+ },
+ trending: {
+ base: "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs",
+ method: "GET",
+ },
+ },
+ },
+ variants: [
+ {
+ environment: { allRegionsAndLocales: true },
+ },
+ ],
+ },
+ {
+ recordType: "defaultEngines",
+ globalDefault: "mozengine",
+ specificDefaults: [],
+ },
+ {
+ recordType: "engineOrders",
+ orders: [],
+ },
+ ]
+ : [
+ {
+ webExtension: { id: "mozengine@tests.mozilla.org" },
+ urls: {
+ trending: {
+ fullPath:
+ "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs",
+ query: "",
+ },
+ },
+ appliesTo: [{ included: { everywhere: true } }],
+ default: "yes",
+ },
+ ]
+ );
- await doTest(async browser => {
+ if (SearchUtils.newSearchConfigEnabled) {
+ let engine = Services.search.getEngineByName("mozengine");
+ await Services.search.setDefault(
+ engine,
+ Ci.nsISearchService.CHANGE_REASON_UNKNOWN
+ );
+ }
+
+ await doTest(async () => {
await openPopup("");
await selectRowByProvider("SearchSuggestions");
await doEnter();
@@ -796,7 +844,13 @@ add_task(async function selected_result_trending() {
]);
});
- await extension.unload();
+ if (SearchUtils.newSearchConfigEnabled) {
+ let engine = Services.search.getEngineByName("mozengine");
+ await Services.search.removeEngine(engine);
+ } else {
+ await extension.unload();
+ }
+
await Services.search.setDefault(
defaultEngine,
Ci.nsISearchService.CHANGE_REASON_UNKNOWN
@@ -823,31 +877,84 @@ add_task(async function selected_result_trending_rich() {
});
let defaultEngine = await Services.search.getDefault();
- let extension = await SearchTestUtils.installSearchExtension(
- {
- name: "mozengine",
- search_url: "https://example.org/",
- },
- { setAsDefault: true, skipUnload: true }
- );
+ let extension;
+ if (!SearchUtils.newSearchConfigEnabled) {
+ extension = await SearchTestUtils.installSearchExtension(
+ {
+ name: "mozengine",
+ search_url: "https://example.org/",
+ },
+ { setAsDefault: true, skipUnload: true }
+ );
+ }
SearchTestUtils.useMockIdleService();
- await SearchTestUtils.updateRemoteSettingsConfig([
- {
- webExtension: { id: "mozengine@tests.mozilla.org" },
- urls: {
- trending: {
- fullPath:
- "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs?richsuggestions=true",
- query: "",
- },
- },
- appliesTo: [{ included: { everywhere: true } }],
- default: "yes",
- },
- ]);
+ await SearchTestUtils.updateRemoteSettingsConfig(
+ SearchUtils.newSearchConfigEnabled
+ ? [
+ {
+ recordType: "engine",
+ identifier: "mozengine",
+ base: {
+ name: "mozengine",
+ urls: {
+ search: {
+ base: "https://example.org/",
+ searchTermParamName: "q",
+ },
+ trending: {
+ base: "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs",
+ method: "GET",
+ params: [
+ {
+ name: "richsuggestions",
+ value: "true",
+ },
+ ],
+ },
+ },
+ },
+ variants: [
+ {
+ environment: { allRegionsAndLocales: true },
+ },
+ ],
+ },
+ {
+ recordType: "defaultEngines",
+ globalDefault: "mozengine",
+ specificDefaults: [],
+ },
+ {
+ recordType: "engineOrders",
+ orders: [],
+ },
+ ]
+ : [
+ {
+ webExtension: { id: "mozengine@tests.mozilla.org" },
+ urls: {
+ trending: {
+ fullPath:
+ "https://example.com/browser/browser/components/search/test/browser/trendingSuggestionEngine.sjs?richsuggestions=true",
+ query: "",
+ },
+ },
+ appliesTo: [{ included: { everywhere: true } }],
+ default: "yes",
+ },
+ ]
+ );
- await doTest(async browser => {
+ if (SearchUtils.newSearchConfigEnabled) {
+ let engine = Services.search.getEngineByName("mozengine");
+ await Services.search.setDefault(
+ engine,
+ Ci.nsISearchService.CHANGE_REASON_UNKNOWN
+ );
+ }
+
+ await doTest(async () => {
await openPopup("");
await selectRowByProvider("SearchSuggestions");
await doEnter();
@@ -863,7 +970,13 @@ add_task(async function selected_result_trending_rich() {
]);
});
- await extension.unload();
+ if (SearchUtils.newSearchConfigEnabled) {
+ let engine = Services.search.getEngineByName("mozengine");
+ await Services.search.removeEngine(engine);
+ } else {
+ await extension.unload();
+ }
+
await Services.search.setDefault(
defaultEngine,
Ci.nsISearchService.CHANGE_REASON_UNKNOWN
@@ -905,7 +1018,7 @@ add_task(async function selected_result_addons() {
],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("only match the Merino suggestion");
await selectRowByProvider("UrlbarProviderQuickSuggest");
await doEnter();
@@ -930,7 +1043,7 @@ add_task(async function selected_result_rust_adm_sponsored() {
prefs: [["quicksuggest.rustEnabled", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("sponsored");
await selectRowByURL("https://example.com/sponsored");
await doEnter();
@@ -954,7 +1067,7 @@ add_task(async function selected_result_rust_adm_nonsponsored() {
prefs: [["quicksuggest.rustEnabled", true]],
});
- await doTest(async browser => {
+ await doTest(async () => {
await openPopup("nonsponsored");
await selectRowByURL("https://example.com/nonsponsored");
await doEnter();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 11:37:24 +0000