Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4ef6f0f9300d (bug 1923212) for causing bc failures on browser_searchModeSwitcher_basic.js CLOSED TREE

Browse Source
This commit is contained in:
Norisz Fay 2024-10-18 20:41:04 +03:00
parent 124d93f80d
commit d0b8be820a
68 changed files with 33 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/tests/browser/events/browser_test_focus_urlbar.js
View File

@ -84,10 +84,6 @@ class TipTestProvider extends UrlbarProvider {
// Check that the URL bar manages accessibility focus appropriately.
async function runTests() {
// TODO: Remove in https://bugzilla.mozilla.org/show_bug.cgi?id=1923383
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
registerCleanupFunction(async function () {
await UrlbarTestUtils.promisePopupClose(window);
await PlacesUtils.history.clear();

4
browser/base/content/test/general/browser_bug462289.js
View File

@ -9,10 +9,7 @@ function focus_in_navbar() {
return parent != null;
}
const SCOTCH_BONNET_PREF = "browser.urlbar.scotchBonnet.enableOverride";
function test() {
Services.prefs.setBoolPref(SCOTCH_BONNET_PREF, false);
// Put the home button in the pre-proton placement to test focus states.
CustomizableUI.addWidgetToArea(
"home-button",
@ -20,7 +17,6 @@ function test() {
CustomizableUI.getPlacementOfWidget("stop-reload-button").position + 1
);
registerCleanupFunction(async function resetToolbar() {
Services.prefs.clearUserPref(SCOTCH_BONNET_PREF);
await CustomizableUI.reset();
});

2
browser/base/content/test/keyboard/browser_toolbarKeyNav.js
View File

@ -120,8 +120,6 @@ const BOOKMARKS_COUNT = 100;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
// TODO: Reenable in https://bugzilla.mozilla.org/show_bug.cgi?id=1923388
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.toolbars.keyboard_navigation", true],
["accessibility.tabfocus", 7],
],

2
browser/base/content/test/performance/browser.toml
View File

@ -22,8 +22,6 @@ prefs = [
"extensions.screenshots.disabled=false",
# Need to keep the revamped sidebar off until Bug 1905212 is done
"sidebar.revamp=false",
# TODO: Renable in Bug 1923381
"browser.urlbar.scotchBonnet.enableOverride=false",
]
support-files = ["head.js"]

6
browser/base/content/test/popupNotifications/browser_popupNotification_no_anchors.js
View File

@ -2,19 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const SCOTCH_BONNET_PREF = "browser.urlbar.scotchBonnet.enableOverride";
function test() {
waitForExplicitFinish();
Services.prefs.setBoolPref(SCOTCH_BONNET_PREF, false);
ok(PopupNotifications, "PopupNotifications object exists");
ok(PopupNotifications.panel, "PopupNotifications panel exists");
setup();
registerCleanupFunction(() => {
Services.prefs.clearUserPref(SCOTCH_BONNET_PREF);
});
}
const FALLBACK_ANCHOR = gURLBar.searchButton

3
browser/base/content/test/siteIdentity/browser_identityBlock_focus.js
View File

@ -17,9 +17,6 @@ registerCleanupFunction(async function resetToolbar() {
});
add_task(async function setupHomeButton() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Put the home button in the pre-proton placement to test focus states.
CustomizableUI.addWidgetToArea(
"home-button",

3
browser/base/content/test/siteIdentity/browser_identity_UI.js
View File

@ -82,9 +82,6 @@ var tests = [
];
add_task(async function test() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
ok(gIdentityHandler, "gIdentityHandler should exist");
await BrowserTestUtils.openNewForegroundTab(gBrowser);

24
browser/components/preferences/tests/browser_localSearchShortcuts.js
View File

@ -14,13 +14,11 @@ ChromeUtils.defineESModuleGetters(this, {
});
let gTree;
const isRestrictKeywordsFeatureOn = () =>
UrlbarPrefs.getScotchBonnetPref("searchRestrictKeywords.featureGate");
const isRestrictKeywordsFeatureOn = UrlbarPrefs.getScotchBonnetPref(
"searchRestrictKeywords.featureGate"
);
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let prefs = await openPreferencesViaOpenPreferencesAPI("search", {
leaveOpen: true,
});
@ -167,10 +165,10 @@ add_task(async function keywordNotEditable_enterKey() {
let keyword = tokenToKeyword.get(shortcut.restrict).toLowerCase();
Assert.equal(
gTree.view.getCellText(row, col),
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? `@${keyword}, ${shortcut.restrict}`
: shortcut.restrict,
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? "Sanity check: Keyword column has correct restriction keyword and char initially"
: "Sanity check: Keyword column has correct restriction char initially"
);
@ -186,10 +184,10 @@ add_task(async function keywordNotEditable_enterKey() {
Assert.equal(
gTree.view.getCellText(row, col),
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? `@${keyword}, ${shortcut.restrict}`
: shortcut.restrict,
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? "Keyword column is still restriction keyword and char"
: "Keyword column is still restriction char"
);
@ -209,10 +207,10 @@ add_task(async function keywordNotEditable_click() {
);
Assert.equal(
gTree.view.getCellText(row, col),
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? `@${keyword}, ${shortcut.restrict}`
: shortcut.restrict,
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? "Sanity check: Keyword column has correct restriction keyword and char initially"
: "Sanity check: Keyword column has correct restriction char initially"
);
@ -252,10 +250,10 @@ add_task(async function keywordNotEditable_click() {
Assert.equal(
gTree.view.getCellText(row, col),
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? `@${keyword}, ${shortcut.restrict}`
: shortcut.restrict,
isRestrictKeywordsFeatureOn()
isRestrictKeywordsFeatureOn
? "Keyword column is still restriction keyword and char"
: "Keyword column is still restriction char"
);

4
browser/components/preferences/tests/browser_searchRestoreDefaults.js
View File

@ -8,10 +8,6 @@ const { SearchUtils } = ChromeUtils.importESModule(
"resource://gre/modules/SearchUtils.sys.mjs"
);
add_task(async function test_restore_functionality() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Ensure no engines are hidden to begin with.
for (let engine of await Services.search.getAppProvidedEngines()) {
if (engine.hidden) {

5
browser/components/sessionstore/test/browser_label_and_icon.js
View File

@ -10,10 +10,7 @@ add_task(async function test_label_and_icon() {
// Make sure that tabs are restored on demand as otherwise the tab will start
// loading immediately and we can't check its icon and label.
await SpecialPowers.pushPrefEnv({
set: [
["browser.sessionstore.restore_on_demand", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.sessionstore.restore_on_demand", true]],
});
// Create a new tab.

3
browser/components/sessionstore/test/browser_urlbarSearchMode.js
View File

@ -18,9 +18,6 @@ ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => {
});
add_task(async function test() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Open the urlbar view and enter search mode.
await UrlbarTestUtils.promiseAutocompleteResultPopup({
window,

1
browser/components/urlbar/tests/browser-tips/browser_searchTips.js
View File

@ -48,7 +48,6 @@ add_setup(async function () {
// Set following prefs so tips are actually shown.
["browser.laterrun.bookkeeping.profileCreationTime", 0],
["browser.laterrun.bookkeeping.updateAppliedTime", 0],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});

6
browser/components/urlbar/tests/browser-tips/browser_selection.js
View File

@ -8,12 +8,6 @@
const HELP_URL = "about:mozilla";
const TIP_URL = "about:about";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
});
add_task(async function tipIsSecondResult() {
let results = [
new UrlbarResult(

3
browser/components/urlbar/tests/browser/browser_UrlbarInput_formatValue.js
View File

@ -40,9 +40,6 @@ async function testVal(urlFormatString, clobberedURLString = null) {
}
add_task(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
const PREF_FORMATTING = "browser.urlbar.formatting.enabled";
const PREF_TRIM_HTTPS = "browser.urlbar.trimHttps";

1
browser/components/urlbar/tests/browser/browser_UrlbarInput_formatValue_strikeout.js
View File

@ -36,7 +36,6 @@ add_task(async function test_strikeout_on_no_https_trimming() {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.trimHttps", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
["security.insecure_connection_text.enabled", false],
["security.mixed_content.block_active_content", false],
],

5
browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_searchMode.js
View File

@ -9,10 +9,7 @@ const SEARCH_STRING = "chocolate cake";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.showSearchTerms.featureGate", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.urlbar.showSearchTerms.featureGate", true]],
});
let cleanup = await installPersistTestEngines();
registerCleanupFunction(async function () {

3
browser/components/urlbar/tests/browser/browser_UrlbarInput_trimURLs.js
View File

@ -45,7 +45,6 @@ function testValues(trimmedProtocol, notTrimmedProtocol) {
add_task(async function () {
const PREF_TRIM_URLS = "browser.urlbar.trimURLs";
const PREF_TRIM_HTTPS = "browser.urlbar.trimHttps";
const PREF_SCOTCHBONNET = "browser.urlbar.scotchBonnet.enableOverride";
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
@ -53,12 +52,10 @@ add_task(async function () {
BrowserTestUtils.removeTab(tab);
Services.prefs.clearUserPref(PREF_TRIM_URLS);
Services.prefs.clearUserPref(PREF_TRIM_HTTPS);
Services.prefs.clearUserPref(PREF_SCOTCHBONNET);
gURLBar.setURI();
});
Services.prefs.setBoolPref(PREF_TRIM_HTTPS, false);
Services.prefs.setBoolPref(PREF_SCOTCHBONNET, false);
// Avoid search service sync init warnings due to URIFixup, when running the
// test alone.

5
browser/components/urlbar/tests/browser/browser_autoFill_preserve.js
View File

@ -16,10 +16,7 @@
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
// The example.com engine can interfere with this test.
set: [
["browser.urlbar.suggest.engines", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.urlbar.suggest.engines", false]],
});
await cleanUp();
});

4
browser/components/urlbar/tests/browser/browser_autocomplete_a11y_label.js
View File

@ -79,10 +79,6 @@ function forceGC() {
}
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await initAccessibilityService();
});

3
browser/components/urlbar/tests/browser/browser_autocomplete_autoselect.js
View File

@ -47,9 +47,6 @@ function assertSelected_one_off(index) {
}
add_task(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let maxResults = Services.prefs.getIntPref("browser.urlbar.maxRichResults");
let tab = await BrowserTestUtils.openNewForegroundTab(
gBrowser,

3
browser/components/urlbar/tests/browser/browser_autocomplete_tag_star_visibility.js
View File

@ -9,9 +9,6 @@
*/
add_task(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
registerCleanupFunction(async function () {
await PlacesUtils.bookmarks.eraseEverything();
});

1
browser/components/urlbar/tests/browser/browser_clipboard.js
View File

@ -16,7 +16,6 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.clipboard.featureGate", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.suggest.clipboard", true],
],
});

1
browser/components/urlbar/tests/browser/browser_copying.js
View File

@ -25,7 +25,6 @@ async function test_copy_values(testValues, trimHttps) {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.trimURLs", true],
["browser.urlbar.trimHttps", trimHttps],
// avoid prompting about phishing

3
browser/components/urlbar/tests/browser/browser_editAndEnterWithSlowQuery.js
View File

@ -9,9 +9,6 @@ const ORIGINAL_CHUNK_RESULTS_DELAY =
UrlbarProvidersManager.CHUNK_RESULTS_DELAY_MS;
add_setup(async function setup() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
});

3
browser/components/urlbar/tests/browser/browser_heuristicNotAddedFirst.js
View File

@ -9,9 +9,6 @@
// When the heuristic result is not the first result added, it should still be
// selected.
add_task(async function slowHeuristicSelected() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// First, add a provider that adds a heuristic result on a delay. Both this
// provider and the one below have a high priority so that only they are used
// during the test.

1
browser/components/urlbar/tests/browser/browser_inputHistory.js
View File

@ -81,7 +81,6 @@ add_setup(async function () {
set: [
// We don't want autofill to influence this test.
["browser.urlbar.autoFill", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});
registerCleanupFunction(async () => {

6
browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js
View File

@ -18,12 +18,6 @@ ChromeUtils.defineLazyGetter(this, "oneOffSearchButtons", () => {
let originalEngine;
let newEngine;
add_setup(async () => {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
});
// The one-off context menu should not be shown.
add_task(async function contextMenu_not_shown() {
// Add a popupshown listener on the context menu that sets this

6
browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js
View File

@ -279,12 +279,6 @@ add_setup(async function () {
);
});
add_setup(async () => {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
});
add_task(async function arrow_engine_url() {
await doArrowTest("mozilla.or", UrlbarUtils.RESULT_TYPE.URL, false);
});

2
browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js
View File

@ -39,7 +39,7 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.separatePrivateDefault.ui.enabled", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.suggest.quickactions", false],
],
});

1
browser/components/urlbar/tests/browser/browser_oneOffs_searchSuggestions.js
View File

@ -25,7 +25,6 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.suggest.searches", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.maxHistoricalSearchSuggestions", 2],
],
});

3
browser/components/urlbar/tests/browser/browser_oneOffs_settings.js
View File

@ -11,9 +11,6 @@
let gMaxResults;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
gMaxResults = Services.prefs.getIntPref("browser.urlbar.maxRichResults");
registerCleanupFunction(async function () {

3
browser/components/urlbar/tests/browser/browser_placeholder.js
View File

@ -36,9 +36,6 @@ var noEngineString;
SearchTestUtils.init(this);
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let originalOrder = (await Services.search.getEngines()).map(e => e.id);
await SearchTestUtils.updateRemoteSettingsConfig(CONFIG);
appDefaultEngine = await Services.search.getDefault();

2
browser/components/urlbar/tests/browser/browser_queryContextCache.js
View File

@ -35,7 +35,7 @@ add_setup(async function () {
await TestUtils.waitForTick();
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
set: [["browser.urlbar.suggest.quickactions", false]],
});
// Add some URLs to populate both history and top sites. Each URL needs to

3
browser/components/urlbar/tests/browser/browser_remove_match.js
View File

@ -6,9 +6,6 @@ ChromeUtils.defineESModuleGetters(this, {
});
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await SearchTestUtils.installSearchExtension({}, { setAsDefault: true });
let engine = Services.search.getEngineByName("Example");

3
browser/components/urlbar/tests/browser/browser_result_menu_general.js
View File

@ -14,9 +14,6 @@ const DEFAULT_HELP_URL =
"awesome-bar-result-menu";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Add enough results to fill up the view.
await PlacesUtils.history.clear();
for (let i = 0; i < MAX_RESULTS; i++) {

4
browser/components/urlbar/tests/browser/browser_result_onSelection.js
View File

@ -4,10 +4,6 @@
"use strict";
add_task(async function test() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let results = [
new UrlbarResult(
UrlbarUtils.RESULT_TYPE.URL,

3
browser/components/urlbar/tests/browser/browser_searchFunction.js
View File

@ -9,9 +9,6 @@ const ALIAS = "@enginealias";
let aliasEngine;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Run this in a new tab, to ensure all the locationchange notifications have
// fired.
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);

10
browser/components/urlbar/tests/browser/browser_searchModeSwitcher_basic.js
View File

@ -674,11 +674,9 @@ add_task(async function test_open_state() {
add_task(async function nimbusScotchBonnetEnableOverride() {
info("Setup initial local pref");
let defaultBranch = Services.prefs.getDefaultBranch("browser.urlbar.");
let initialValue = defaultBranch.getBoolPref("scotchBonnet.enableOverride");
defaultBranch.setBoolPref("scotchBonnet.enableOverride", false);
UrlbarPrefs.clear("scotchBonnet.enableOverride");
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await TestUtils.waitForCondition(() => {
return BrowserTestUtils.isHidden(
gURLBar.querySelector("#urlbar-searchmode-switcher")
@ -699,7 +697,7 @@ add_task(async function nimbusScotchBonnetEnableOverride() {
Assert.ok(true, "Search mode switcher should be visible");
await cleanUpNimbusEnable();
defaultBranch.setBoolPref("scotchBonnet.enableOverride", initialValue);
await SpecialPowers.popPrefEnv();
});
add_task(async function nimbusLogEnabled() {

3
browser/components/urlbar/tests/browser/browser_searchMode_alias_replacement.js
View File

@ -19,9 +19,6 @@ const TEST_SPACES = [" ", "\u3000", " \u3000", "\u3000 "];
let defaultEngine, aliasEngine;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
defaultEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,

2
browser/components/urlbar/tests/browser/browser_searchMode_autofill.js
View File

@ -18,7 +18,7 @@ add_setup(async function () {
await Services.search.moveEngine(defaultEngine, 0);
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
set: [["browser.urlbar.suggest.quickactions", false]],
});
registerCleanupFunction(async () => {

3
browser/components/urlbar/tests/browser/browser_searchMode_clickLink.js
View File

@ -16,9 +16,6 @@ const LINK_PAGE_URL =
// branches in setURI. Search mode should be exited in all cases, and the href
// in the link should be opened.
add_task(async function clickLink() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
for (let test of [
// searchString, href to use in the link
[LINK_PAGE_URL, LINK_PAGE_URL],

3
browser/components/urlbar/tests/browser/browser_searchMode_engineRemoval.js
View File

@ -10,9 +10,6 @@
// Tests that we exit search mode in the active tab when the search mode engine
// is removed.
add_task(async function activeTab() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
let extension = await SearchTestUtils.installSearchExtension(
{},
{ skipUnload: true }

1
browser/components/urlbar/tests/browser/browser_searchMode_excludeResults.js
View File

@ -19,7 +19,6 @@ add_setup(async function () {
["browser.urlbar.autoFill", false],
// Special prefs for remote tabs.
["services.sync.username", "fake"],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});

3
browser/components/urlbar/tests/browser/browser_searchMode_heuristic.js
View File

@ -8,9 +8,6 @@
"use strict";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await PlacesUtils.history.clear();
await PlacesUtils.bookmarks.eraseEverything();

3
browser/components/urlbar/tests/browser/browser_searchMode_indicator.js
View File

@ -23,9 +23,6 @@ let suggestionsEngine;
let defaultEngine;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + SUGGESTIONS_ENGINE_NAME,
});

5
browser/components/urlbar/tests/browser/browser_searchMode_indicator_clickthrough.js
View File

@ -11,10 +11,7 @@
add_task(async function test() {
// Avoid remote connections.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.suggest.enabled", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.search.suggest.enabled", false]],
});
await BrowserTestUtils.withNewTab("about:robots", async () => {

3
browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js
View File

@ -17,7 +17,8 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.suggest.searches", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.suggest.quickactions", false],
["browser.urlbar.shortcuts.quickactions", false],
],
});
engine = await SearchTestUtils.installOpenSearchEngine({

1
browser/components/urlbar/tests/browser/browser_searchMode_no_results.js
View File

@ -29,7 +29,6 @@ add_setup(async function () {
"browser.newtabpage.activity-stream.default.sites",
"http://example.com/",
],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});
await updateTopSites(sites => sites.length);

3
browser/components/urlbar/tests/browser/browser_searchMode_omnibox.js
View File

@ -9,9 +9,6 @@
const ENGINE_NAME = "Example";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await SearchTestUtils.installSearchExtension({
name: ENGINE_NAME,
});

3
browser/components/urlbar/tests/browser/browser_searchMode_oneOffButton.js
View File

@ -10,9 +10,6 @@
const TEST_ENGINE_NAME = "test engine";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await SearchTestUtils.installSearchExtension({
name: TEST_ENGINE_NAME,
keyword: "@test",

3
browser/components/urlbar/tests/browser/browser_searchMode_pickResult.js
View File

@ -10,9 +10,6 @@
const BOOKMARK_URL = "http://www.example.com/browser_searchMode_pickResult.js";
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Add a bookmark so we can enter bookmarks search mode and pick it.
await PlacesUtils.bookmarks.eraseEverything();
await PlacesUtils.bookmarks.insert({

2
browser/components/urlbar/tests/browser/browser_searchMode_preview.js
View File

@ -16,7 +16,7 @@ add_setup(async function () {
});
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
set: [["browser.urlbar.suggest.quickactions", false]],
});
if (UrlbarPrefs.getScotchBonnetPref("searchRestrictKeywords.featureGate")) {
await SpecialPowers.pushPrefEnv({

5
browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js
View File

@ -27,11 +27,6 @@ const URL = "http://example.com/";
const INITIAL_URL = "about:newtab";
// The following tasks make sure non-null search mode is restored.
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
});
add_task(async function initialPageOnRestore() {
await doTest({

3
browser/components/urlbar/tests/browser/browser_searchMode_setURI.js
View File

@ -13,9 +13,6 @@
// in order to hit different branches in setURI. Search mode should remain
// active or be exited as appropriate.
add_task(async function setURI() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
for (let test of [
// initialURL, searchString, url, expectSearchMode

4
browser/components/urlbar/tests/browser/browser_searchMode_suggestions.js
View File

@ -66,7 +66,7 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.separatePrivateDefault.ui.enabled", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
["browser.urlbar.suggest.quickactions", false],
["browser.urlbar.suggest.trending", false],
["browser.urlbar.suggest.recentsearches", false],
],
@ -112,6 +112,7 @@ add_task(async function emptySearch_behavior() {
},
]);
await UrlbarTestUtils.promisePopupClose(window);
await SpecialPowers.popPrefEnv();
});
await PlacesUtils.history.clear();
@ -140,6 +141,7 @@ add_task(async function emptySearch_local() {
]);
await UrlbarTestUtils.exitSearchMode(window, { clickClose: true });
await UrlbarTestUtils.promisePopupClose(window);
await SpecialPowers.popPrefEnv();
});
await PlacesUtils.history.clear();

2
browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js
View File

@ -10,7 +10,7 @@
// Enters search mode using the one-off buttons.
add_task(async function switchTabs() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
set: [["browser.urlbar.suggest.quickactions", false]],
});
// Open three tabs. We'll enter search mode in tabs 0 and 2.

3
browser/components/urlbar/tests/browser/browser_searchSettings.js
View File

@ -4,9 +4,6 @@
"use strict";
add_task(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
async function () {

3
browser/components/urlbar/tests/browser/browser_searchSingleWordNotification.js
View File

@ -3,9 +3,6 @@
let gDNSResolved = false;
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
registerCleanupFunction(function () {
Services.prefs.clearUserPref("browser.fixup.domainwhitelist.localhost");
});

2
browser/components/urlbar/tests/browser/browser_selectStaleResults.js
View File

@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(this, {
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
set: [["browser.urlbar.suggest.quickactions", false]],
});
// We'll later replace this, so ensure it's restored.

3
browser/components/urlbar/tests/browser/browser_selectionKeyNavigation.js
View File

@ -10,9 +10,6 @@
const MAX_RESULTS = UrlbarPrefs.get("maxRichResults");
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
for (let i = 0; i < MAX_RESULTS; i++) {
await PlacesTestUtils.addVisits("http://example.com/" + i);
}

5
browser/components/urlbar/tests/browser/browser_shortcuts_add_search_engine.js
View File

@ -15,10 +15,7 @@ const BASE_URL =
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.suggest.searches", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.urlbar.suggest.searches", false]],
});
// Ensure initial state.
UrlbarTestUtils.getOneOffSearchButtons(window).invalidateCache();

3
browser/components/urlbar/tests/browser/browser_switchToTab_chiclet.js
View File

@ -11,9 +11,6 @@
const TEST_URL = `${TEST_BASE_URL}dummy_page.html`;
add_task(async function test_with_oneoff_button() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
info("Loading test page into first tab");
let promiseLoad = BrowserTestUtils.browserLoaded(
gBrowser.selectedBrowser,

5
browser/components/urlbar/tests/browser/browser_tabKeyBehavior.js
View File

@ -14,10 +14,7 @@ add_setup(async function () {
false
);
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.suggest.quickactions", false],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.urlbar.suggest.quickactions", false]],
});
for (let i = 0; i < UrlbarPrefs.get("maxRichResults"); i++) {

1
browser/components/urlbar/tests/browser/browser_tabToSearch.js
View File

@ -25,7 +25,6 @@ add_setup(async function () {
// Disable onboarding results for general tests. They are enabled in tests
// that specifically address onboarding.
["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});

5
browser/components/urlbar/tests/browser/browser_tokenAlias.js
View File

@ -37,10 +37,7 @@ add_setup(async function () {
// Search results aren't shown in quantumbar unless search suggestions are
// enabled.
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.suggest.searches", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
set: [["browser.urlbar.suggest.searches", true]],
});
// When typing `@`, we are getting token alias engine results and restrict

4
browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js
View File

@ -128,10 +128,6 @@ add_setup(async function () {
set: [["browser.urlbar.showSearchSuggestionsFirst", false]],
});
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
});
// Make sure to restore the engine once we're done.
registerCleanupFunction(async function () {
Services.telemetry.canRecordExtended = oldCanRecord;

1
browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js
View File

@ -87,7 +87,6 @@ add_setup(async function () {
// Disable tab-to-search onboarding results for general tests. They are
// enabled in tests that specifically address onboarding.
["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});

1
browser/components/urlbar/tests/engagementTelemetry/browser/head.js
View File

@ -400,7 +400,6 @@ async function setup() {
["browser.urlbar.searchEngagementTelemetry.enabled", true],
["browser.urlbar.quickactions.enabled", true],
["browser.urlbar.secondaryActions.featureGate", true],
["browser.urlbar.scotchBonnet.enableOverride", false],
],
});