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

No bug - Cleanup browser_connection.js so it's a better example for related tests. r=me

Browse Source
This commit is contained in:
Matthew Noorenberghe 2014-03-01 16:19:57 -05:00
parent fb5942a367
commit b68d5dd89d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
browser/components/preferences/in-content/tests/browser_connection.js
View File

@ -7,7 +7,7 @@ Components.utils.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");
@ -16,10 +16,9 @@ function test() {
Services.prefs.clearUserPref("network.proxy.no_proxies_on");
Services.prefs.clearUserPref("browser.preferences.instantApply");
});
let connectionURI = "chrome://browser/content/preferences/connection.xul";
let windowWatcher = Cc["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher);
let connectionURL = "chrome://browser/content/preferences/connection.xul";
let windowWatcher = Services.ww;
// instantApply must be true, otherwise connection dialog won't save
// when opened from in-content prefs
@ -28,13 +27,12 @@ function test() {
// this observer is registered after the pref tab loads
let observer = {
observe: function(aSubject, aTopic, aData) {
if (aTopic == "domwindowopened") {
// when connection window loads, run tests and acceptDialog()
let win = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow);
win.addEventListener("load", function winLoadListener() {
win.removeEventListener("load", winLoadListener, false);
if (win.location.href == connectionURI) {
if (win.location.href == connectionURL) {
ok(true, "connection window opened");
runConnectionTests(win);
win.document.documentElement.acceptDialog();
@ -43,7 +41,7 @@ function test() {
} else if (aTopic == "domwindowclosed") {
// finish up when connection window closes
let win = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow);
if (win.location.href == connectionURI) {
if (win.location.href == connectionURL) {
windowWatcher.unregisterNotification(observer);
ok(true, "connection window closed");
// runConnectionTests will have changed this pref - make sure it was
@ -54,9 +52,8 @@ function test() {
finish();
}
}
}
}
};
/*
The connection dialog alone won't save onaccept since it uses type="child",
@ -82,7 +79,7 @@ function runConnectionTests(win) {
"networkProxyNone textbox is multiline");
is(networkProxyNone.getAttribute("rows"), "2",
"networkProxyNone textbox has two rows");
// check if sanitizing the given input for the no_proxies_on pref results in
// expected string
function testSanitize(input, expected, errorMessage) {