fune/browser/components/preferences/in-content/tests/browser_connection_dnsoverhttps.js
Kris Maglione e930b89c34 Bug 1514594: Part 3 - Change ChromeUtils.import API.
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8

This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:

  ChromeUtils.import("resource://gre/modules/Services.jsm");

is approximately the same as the following, in the new model:

  var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");

Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs

This was done using the followng script:

https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8

Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs

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

--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
2019-01-17 10:18:31 -08:00

182 lines
7.3 KiB
JavaScript

var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const SUBDIALOG_URL = "chrome://browser/content/preferences/connection.xul";
const TRR_MODE_PREF = "network.trr.mode";
const TRR_URI_PREF = "network.trr.uri";
const TRR_CUSTOM_URI_PREF = "network.trr.custom_uri";
const modeCheckboxSelector = "#networkDnsOverHttps";
const uriTextboxSelector = "#customDnsOverHttpsInput";
const defaultPrefValues = Object.freeze({
[TRR_MODE_PREF]: 0,
[TRR_URI_PREF]: "https://mozilla.cloudflare-dns.com/dns-query",
[TRR_CUSTOM_URI_PREF]: "",
});
function resetPrefs() {
Services.prefs.clearUserPref(TRR_MODE_PREF);
Services.prefs.clearUserPref(TRR_URI_PREF);
Services.prefs.clearUserPref(TRR_CUSTOM_URI_PREF);
}
let preferencesOpen = new Promise(res => open_preferences(res));
registerCleanupFunction(() => {
resetPrefs();
gBrowser.removeCurrentTab();
});
async function openConnectionsSubDialog() {
/*
The connection dialog has type="child", So it has to be opened as a sub dialog
of the main pref tab. Prefs only get updated after the subdialog is confirmed & closed
*/
let dialog = await openAndLoadSubDialog(SUBDIALOG_URL);
ok(dialog, "connection window opened");
return dialog;
}
function waitForPrefObserver(name) {
return new Promise(resolve => {
const observer = {
observe(aSubject, aTopic, aData) {
if (aData == name) {
Services.prefs.removeObserver(name, observer);
resolve();
}
},
};
Services.prefs.addObserver(name, observer);
});
}
async function testWithProperties(props, startTime) {
info((Date.now() - startTime) + ": testWithProperties: testing with " + JSON.stringify(props));
if (props.hasOwnProperty(TRR_MODE_PREF)) {
Services.prefs.setIntPref(TRR_MODE_PREF, props[TRR_MODE_PREF]);
}
if (props.hasOwnProperty(TRR_CUSTOM_URI_PREF)) {
Services.prefs.setStringPref(TRR_CUSTOM_URI_PREF, props[TRR_CUSTOM_URI_PREF]);
}
if (props.hasOwnProperty(TRR_URI_PREF)) {
Services.prefs.setStringPref(TRR_URI_PREF, props[TRR_URI_PREF]);
}
let dialog = await openConnectionsSubDialog();
info((Date.now() - startTime) + ": testWithProperties: connections dialog now open");
let doc = dialog.document;
let win = doc.ownerGlobal;
let dialogClosingPromise = BrowserTestUtils.waitForEvent(doc.documentElement,
"dialogclosing");
let modeCheckbox = doc.querySelector(modeCheckboxSelector);
let uriTextbox = doc.querySelector(uriTextboxSelector);
let uriPrefChangedPromise;
let modePrefChangedPromise;
if (props.hasOwnProperty("expectedModeChecked")) {
is(modeCheckbox.checked, props.expectedModeChecked, "mode checkbox has expected checked state");
}
if (props.hasOwnProperty("expectedUriValue")) {
is(uriTextbox.value, props.expectedUriValue, "URI textbox has expected value");
}
if (props.clickMode) {
info((Date.now() - startTime) + ": testWithProperties: clickMode, waiting for the pref observer");
modePrefChangedPromise = waitForPrefObserver(TRR_MODE_PREF);
info((Date.now() - startTime) + ": testWithProperties: clickMode, pref changed");
modeCheckbox.scrollIntoView();
EventUtils.synthesizeMouseAtCenter(modeCheckbox, {}, win);
info((Date.now() - startTime) + ": testWithProperties: clickMode, mouse click synthesized");
}
if (props.hasOwnProperty("inputUriKeys")) {
info((Date.now() - startTime) + ": testWithProperties: inputUriKeys, waiting for the pref observer");
uriPrefChangedPromise = waitForPrefObserver(TRR_CUSTOM_URI_PREF);
info((Date.now() - startTime) + ": testWithProperties: inputUriKeys, pref changed, now enter the new value");
uriTextbox.focus();
uriTextbox.value = props.inputUriKeys;
uriTextbox.dispatchEvent(new win.Event("input", {bubbles: true}));
uriTextbox.dispatchEvent(new win.Event("change", {bubbles: true}));
info((Date.now() - startTime) + ": testWithProperties: inputUriKeys, input and change events dispatched");
}
info((Date.now() - startTime) + ": testWithProperties: calling acceptDialog");
doc.documentElement.acceptDialog();
info((Date.now() - startTime) + ": testWithProperties: waiting for the dialogClosingPromise");
let dialogClosingEvent = await dialogClosingPromise;
ok(dialogClosingEvent, "connection window closed");
info((Date.now() - startTime) + ": testWithProperties: waiting for any of uri and mode prefs to change");
await Promise.all([uriPrefChangedPromise, modePrefChangedPromise]);
info((Date.now() - startTime) + ": testWithProperties: prefs changed");
if (props.hasOwnProperty("expectedFinalUriPref")) {
let uriPref = Services.prefs.getStringPref(TRR_URI_PREF);
is(uriPref, props.expectedFinalUriPref, "uri pref ended up with the expected value");
}
if (props.hasOwnProperty("expectedModePref")) {
let modePref = Services.prefs.getIntPref(TRR_MODE_PREF);
is(modePref, props.expectedModePref, "mode pref ended up with the expected value");
}
info((Date.now() - startTime) + ": testWithProperties: fin");
}
add_task(async function default_values() {
let customUriPref = Services.prefs.getStringPref(TRR_CUSTOM_URI_PREF);
let uriPref = Services.prefs.getStringPref(TRR_URI_PREF);
let modePref = Services.prefs.getIntPref(TRR_MODE_PREF);
is(modePref, defaultPrefValues[TRR_MODE_PREF],
`Actual value of ${TRR_MODE_PREF} matches expected default value`);
is(uriPref, defaultPrefValues[TRR_URI_PREF],
`Actual value of ${TRR_URI_PREF} matches expected default value`);
is(customUriPref, defaultPrefValues[TRR_CUSTOM_URI_PREF],
`Actual value of ${TRR_CUSTOM_URI_PREF} matches expected default value`);
});
let testVariations = [
// verify state with defaults
{ expectedModePref: 0, expectedUriValue: "" },
// verify each of the modes maps to the correct checked state
{ [TRR_MODE_PREF]: 0, expectedModeChecked: false },
{ [TRR_MODE_PREF]: 1, expectedModeChecked: true },
{ [TRR_MODE_PREF]: 2, expectedModeChecked: true },
{ [TRR_MODE_PREF]: 3, expectedModeChecked: true },
{ [TRR_MODE_PREF]: 4, expectedModeChecked: true },
{ [TRR_MODE_PREF]: 5, expectedModeChecked: false },
// verify an out of bounds mode value maps to the correct checked state
{ [TRR_MODE_PREF]: 77, expectedModeChecked: false },
// verify toggling the checkbox gives the right outcomes
{ clickMode: true, expectedModeValue: 2, expectedUriValue: "" },
{
[TRR_MODE_PREF]: 4,
expectedModeChecked: true, clickMode: true, expectedModePref: 0,
},
// test that setting TRR_CUSTOM_URI_PREF subsequently changes TRR_URI_PREF
{
[TRR_MODE_PREF]: 2, [TRR_CUSTOM_URI_PREF]: "https://example.com",
expectedModeValue: true, expectedUriValue: "https://example.com",
},
{
[TRR_URI_PREF]: "",
clickMode: true, inputUriKeys: "https://example.com",
expectedModePref: 2, expectedFinalUriPref: "https://example.com",
},
// verify the uri can be cleared
{
[TRR_MODE_PREF]: 2, [TRR_URI_PREF]: "https://example.com", [TRR_CUSTOM_URI_PREF]: "https://example.com",
expectedUriValue: "https://example.com", inputUriKeys: "", expectedFinalUriPref: "",
},
];
for (let props of testVariations) {
add_task(async function testVariation() {
await preferencesOpen;
let startTime = Date.now();
resetPrefs();
await testWithProperties(props, startTime);
});
}