зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1693857 - [remote] Only apply custom preferences if provided. r=webdriver-reviewers,jdescottes
If we aren't checking that extra preferences are actually provided, we will fail completely in setting recommended preferences. Differential Revision: https://phabricator.services.mozilla.com/D198698
This commit is contained in:
Henrik Skupin
Родитель
ac1ced1f8c
Коммит
b14035e694
|
|
@ -356,10 +356,11 @@ export const RecommendedPreferences = {
|
|||
|
||||
/**
|
||||
* Apply the provided map of preferences.
|
||||
* They will be automatically reset on application shutdown.
|
||||
*
|
||||
* @param {Map} preferences
|
||||
* Map of preference key to preference value.
|
||||
* Note, that they will be automatically reset on application shutdown.
|
||||
*
|
||||
* @param {Map<string, object>=} preferences
|
||||
* Map of preference name to preference value.
|
||||
*/
|
||||
applyPreferences(preferences) {
|
||||
if (!lazy.useRecommendedPrefs) {
|
||||
|
|
@ -371,8 +372,14 @@ export const RecommendedPreferences = {
|
|||
// Only apply common recommended preferences on first call to
|
||||
// applyPreferences.
|
||||
if (!this.isInitialized) {
|
||||
// Merge common preferences and provided preferences in a single map.
|
||||
preferences = new Map([...COMMON_PREFERENCES, ...preferences]);
|
||||
// Merge common preferences and optionally provided preferences in a
|
||||
// single map. Hereby the extra preferences have higher priority.
|
||||
if (preferences) {
|
||||
preferences = new Map([...COMMON_PREFERENCES, ...preferences]);
|
||||
} else {
|
||||
preferences = COMMON_PREFERENCES;
|
||||
}
|
||||
|
||||
Services.obs.addObserver(this, "quit-application");
|
||||
this.isInitialized = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ const { RecommendedPreferences } = ChromeUtils.importESModule(
|
|||
|
||||
const COMMON_PREF = "toolkit.startup.max_resumed_crashes";
|
||||
|
||||
const MARIONETTE_PREF = "dom.disable_beforeunload";
|
||||
const MARIONETTE_RECOMMENDED_PREFS = new Map([[MARIONETTE_PREF, true]]);
|
||||
const PROTOCOL_1_PREF = "dom.disable_beforeunload";
|
||||
const PROTOCOL_1_RECOMMENDED_PREFS = new Map([[PROTOCOL_1_PREF, true]]);
|
||||
|
||||
const CDP_PREF = "browser.contentblocking.features.standard";
|
||||
const CDP_RECOMMENDED_PREFS = new Map([
|
||||
[CDP_PREF, "-tp,tpPrivate,cookieBehavior0,-cm,-fp"],
|
||||
const PROTOCOL_2_PREF = "browser.contentblocking.features.standard";
|
||||
const PROTOCOL_2_RECOMMENDED_PREFS = new Map([
|
||||
[PROTOCOL_2_PREF, "-tp,tpPrivate,cookieBehavior0,-cm,-fp"],
|
||||
]);
|
||||
|
||||
function cleanup() {
|
||||
|
|
@ -27,55 +27,62 @@ function cleanup() {
|
|||
// - via registerCleanupFunction in case a test crashes/times out
|
||||
registerCleanupFunction(cleanup);
|
||||
|
||||
add_task(async function test_RecommendedPreferences() {
|
||||
add_task(async function test_multipleClients() {
|
||||
info("Check initial values for the test preferences");
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
info("Apply recommended preferences for a marionette client");
|
||||
RecommendedPreferences.applyPreferences(MARIONETTE_RECOMMENDED_PREFS);
|
||||
checkPreferences({ cdp: false, common: true, marionette: true });
|
||||
info("Apply recommended preferences for a protocol_1 client");
|
||||
RecommendedPreferences.applyPreferences(PROTOCOL_1_RECOMMENDED_PREFS);
|
||||
checkPreferences({ common: true, protocol_1: true, protocol_2: false });
|
||||
|
||||
info("Apply recommended preferences for a cdp client");
|
||||
RecommendedPreferences.applyPreferences(CDP_RECOMMENDED_PREFS);
|
||||
checkPreferences({ cdp: true, common: true, marionette: true });
|
||||
info("Apply recommended preferences for a protocol_2 client");
|
||||
RecommendedPreferences.applyPreferences(PROTOCOL_2_RECOMMENDED_PREFS);
|
||||
checkPreferences({ common: true, protocol_1: true, protocol_2: true });
|
||||
|
||||
info("Restore marionette preferences");
|
||||
RecommendedPreferences.restorePreferences(MARIONETTE_RECOMMENDED_PREFS);
|
||||
checkPreferences({ cdp: true, common: true, marionette: false });
|
||||
info("Restore protocol_1 preferences");
|
||||
RecommendedPreferences.restorePreferences(PROTOCOL_1_RECOMMENDED_PREFS);
|
||||
checkPreferences({ common: true, protocol_1: false, protocol_2: true });
|
||||
|
||||
info("Restore cdp preferences");
|
||||
RecommendedPreferences.restorePreferences(CDP_RECOMMENDED_PREFS);
|
||||
checkPreferences({ cdp: false, common: true, marionette: false });
|
||||
info("Restore protocol_2 preferences");
|
||||
RecommendedPreferences.restorePreferences(PROTOCOL_2_RECOMMENDED_PREFS);
|
||||
checkPreferences({ common: true, protocol_1: false, protocol_2: false });
|
||||
|
||||
info("Restore all the altered preferences");
|
||||
RecommendedPreferences.restoreAllPreferences();
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
info("Attemps to restore again");
|
||||
RecommendedPreferences.restoreAllPreferences();
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
cleanup();
|
||||
});
|
||||
|
||||
add_task(async function test_RecommendedPreferences_disabled() {
|
||||
add_task(async function test_disabled() {
|
||||
info("Disable RecommendedPreferences");
|
||||
Services.prefs.setBoolPref("remote.prefs.recommended", false);
|
||||
|
||||
info("Check initial values for the test preferences");
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
info("Recommended preferences are not applied, applyPreferences is a no-op");
|
||||
RecommendedPreferences.applyPreferences(MARIONETTE_RECOMMENDED_PREFS);
|
||||
checkPreferences({ cdp: false, common: false, marionette: false });
|
||||
RecommendedPreferences.applyPreferences(PROTOCOL_1_RECOMMENDED_PREFS);
|
||||
checkPreferences({ common: false, protocol_1: false, protocol_2: false });
|
||||
|
||||
cleanup();
|
||||
});
|
||||
|
||||
add_task(async function test_noCustomPreferences() {
|
||||
info("Applying preferences without any custom preference should not throw");
|
||||
RecommendedPreferences.applyPreferences();
|
||||
|
||||
cleanup();
|
||||
});
|
||||
|
||||
// Check that protocols can override common preferences.
|
||||
add_task(async function test_RecommendedPreferences_override() {
|
||||
add_task(async function test_override() {
|
||||
info("Make sure the common preference has no user value");
|
||||
Services.prefs.clearUserPref(COMMON_PREF);
|
||||
|
||||
|
|
@ -94,10 +101,10 @@ add_task(async function test_RecommendedPreferences_override() {
|
|||
cleanup();
|
||||
});
|
||||
|
||||
function checkPreferences({ cdp, common, marionette }) {
|
||||
function checkPreferences({ common, protocol_1, protocol_2 }) {
|
||||
checkPreference(COMMON_PREF, { hasValue: common });
|
||||
checkPreference(MARIONETTE_PREF, { hasValue: marionette });
|
||||
checkPreference(CDP_PREF, { hasValue: cdp });
|
||||
checkPreference(PROTOCOL_1_PREF, { hasValue: protocol_1 });
|
||||
checkPreference(PROTOCOL_2_PREF, { hasValue: protocol_2 });
|
||||
}
|
||||
|
||||
function checkPreference(pref, { hasValue }) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче