Commit b282b7ca authored by Michael Kaply's avatar Michael Kaply
Browse files

Bug 1522202 - Switch policy sorting test to case insensitive. r=Felipe

Differential Revision: https://phabricator.services.mozilla.com/D17403

--HG--
extra : moz-landing-system : lando
parent b52e9322
......@@ -264,26 +264,6 @@ var Policies = {
},
},
"DNSOverHTTPS": {
onBeforeAddons(manager, param) {
if ("Enabled" in param) {
let mode = param.Enabled ? 2 : 5;
if (param.Locked) {
setAndLockPref("network.trr.mode", mode);
} else {
setDefaultPref("network.trr.mode", mode);
}
}
if (param.ProviderURL) {
if (param.Locked) {
setAndLockPref("network.trr.uri", param.ProviderURL.href);
} else {
setDefaultPref("network.trr.uri", param.ProviderURL.href);
}
}
},
},
"DisableAppUpdate": {
onBeforeAddons(manager, param) {
if (param) {
......@@ -476,6 +456,26 @@ var Policies = {
},
},
"DNSOverHTTPS": {
onBeforeAddons(manager, param) {
if ("Enabled" in param) {
let mode = param.Enabled ? 2 : 5;
if (param.Locked) {
setAndLockPref("network.trr.mode", mode);
} else {
setDefaultPref("network.trr.mode", mode);
}
}
if (param.ProviderURL) {
if (param.Locked) {
setAndLockPref("network.trr.uri", param.ProviderURL.href);
} else {
setDefaultPref("network.trr.uri", param.ProviderURL.href);
}
}
},
},
"DontCheckDefaultBrowser": {
onBeforeUIStartup(manager, param) {
setAndLockPref("browser.shell.checkDefaultBrowser", false);
......
......@@ -145,21 +145,6 @@
}
},
"DNSOverHTTPS": {
"type": "object",
"properties": {
"Enabled": {
"type": "boolean"
},
"ProviderURL": {
"type": "URLorEmpty"
},
"Locked": {
"type": "boolean"
}
}
},
"DisableAppUpdate": {
"type": "boolean"
},
......@@ -253,6 +238,21 @@
"type": "boolean"
},
"DNSOverHTTPS": {
"type": "object",
"properties": {
"Enabled": {
"type": "boolean"
},
"ProviderURL": {
"type": "URLorEmpty"
},
"Locked": {
"type": "boolean"
}
}
},
"DontCheckDefaultBrowser": {
"type": "boolean"
},
......
......@@ -5,7 +5,7 @@
function checkArrayIsSorted(array, msg) {
let sorted = true;
let sortedArray = array.slice().sort();
let sortedArray = array.slice().sort(function(a, b) { return a.localeCompare(b); });
for (let i = 0; i < array.length; i++) {
if (array[i] != sortedArray[i]) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment