forked from mirrors/gecko-dev
e930b89c34
***
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
64 lines
2.9 KiB
JavaScript
64 lines
2.9 KiB
JavaScript
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
|
|
// network.proxy.type needs to be backed up and restored because mochitest
|
|
// changes this setting from the default
|
|
let oldNetworkProxyType = Services.prefs.getIntPref("network.proxy.type");
|
|
registerCleanupFunction(function() {
|
|
Services.prefs.setIntPref("network.proxy.type", oldNetworkProxyType);
|
|
Services.prefs.clearUserPref("browser.preferences.instantApply");
|
|
Services.prefs.clearUserPref("network.proxy.share_proxy_settings");
|
|
for (let proxyType of ["http", "ssl", "ftp", "socks"]) {
|
|
Services.prefs.clearUserPref("network.proxy." + proxyType);
|
|
Services.prefs.clearUserPref("network.proxy." + proxyType + "_port");
|
|
if (proxyType == "http") {
|
|
continue;
|
|
}
|
|
Services.prefs.clearUserPref("network.proxy.backup." + proxyType);
|
|
Services.prefs.clearUserPref("network.proxy.backup." + proxyType + "_port");
|
|
}
|
|
});
|
|
|
|
let connectionURL = "chrome://browser/content/preferences/connection.xul";
|
|
|
|
// Set a shared proxy and a SOCKS backup
|
|
Services.prefs.setIntPref("network.proxy.type", 1);
|
|
Services.prefs.setBoolPref("network.proxy.share_proxy_settings", true);
|
|
Services.prefs.setCharPref("network.proxy.http", "example.com");
|
|
Services.prefs.setIntPref("network.proxy.http_port", 1200);
|
|
Services.prefs.setCharPref("network.proxy.socks", "example.com");
|
|
Services.prefs.setIntPref("network.proxy.socks_port", 1200);
|
|
Services.prefs.setCharPref("network.proxy.backup.socks", "127.0.0.1");
|
|
Services.prefs.setIntPref("network.proxy.backup.socks_port", 9050);
|
|
|
|
/*
|
|
The connection dialog alone won't save onaccept since it uses type="child",
|
|
so it has to be opened as a sub dialog of the main pref tab.
|
|
Open the main tab here.
|
|
*/
|
|
open_preferences(async function tabOpened(aContentWindow) {
|
|
is(gBrowser.currentURI.spec, "about:preferences", "about:preferences loaded");
|
|
let dialog = await openAndLoadSubDialog(connectionURL);
|
|
let dialogClosingPromise = BrowserTestUtils.waitForEvent(dialog.document.documentElement, "dialogclosing");
|
|
|
|
ok(dialog, "connection window opened");
|
|
dialog.document.documentElement.acceptDialog();
|
|
|
|
let dialogClosingEvent = await dialogClosingPromise;
|
|
ok(dialogClosingEvent, "connection window closed");
|
|
|
|
// The SOCKS backup should not be replaced by the shared value
|
|
is(Services.prefs.getCharPref("network.proxy.backup.socks"), "127.0.0.1", "Shared proxy backup shouldn't be replaced");
|
|
is(Services.prefs.getIntPref("network.proxy.backup.socks_port"), 9050, "Shared proxy port backup shouldn't be replaced");
|
|
|
|
gBrowser.removeCurrentTab();
|
|
finish();
|
|
});
|
|
}
|