forked from mirrors/gecko-dev
This uses the pref browser.preferences.useOldOrganization=true to use the old prefs. MozReview-Commit-ID: DQyHYSZJTKd --HG-- rename : browser/components/preferences/in-content/advanced.js => browser/components/preferences/in-content-old/advanced.js rename : browser/components/preferences/in-content/advanced.xul => browser/components/preferences/in-content-old/advanced.xul rename : browser/components/preferences/in-content/applications.js => browser/components/preferences/in-content-old/applications.js rename : browser/components/preferences/in-content/applications.xul => browser/components/preferences/in-content-old/applications.xul rename : browser/components/preferences/in-content/containers.js => browser/components/preferences/in-content-old/containers.js rename : browser/components/preferences/in-content/containers.xul => browser/components/preferences/in-content-old/containers.xul rename : browser/components/preferences/in-content/content.js => browser/components/preferences/in-content-old/content.js rename : browser/components/preferences/in-content/content.xul => browser/components/preferences/in-content-old/content.xul rename : browser/components/preferences/in-content/jar.mn => browser/components/preferences/in-content-old/jar.mn rename : browser/components/preferences/in-content/main.js => browser/components/preferences/in-content-old/main.js rename : browser/components/preferences/in-content/main.xul => browser/components/preferences/in-content-old/main.xul rename : browser/components/preferences/in-content/moz.build => browser/components/preferences/in-content-old/moz.build rename : browser/components/preferences/in-content/preferences.js => browser/components/preferences/in-content-old/preferences.js rename : browser/components/preferences/in-content/preferences.xul => browser/components/preferences/in-content-old/preferences.xul rename : browser/components/preferences/in-content/privacy.js => browser/components/preferences/in-content-old/privacy.js rename : browser/components/preferences/in-content/privacy.xul => browser/components/preferences/in-content-old/privacy.xul rename : browser/components/preferences/in-content/search.js => browser/components/preferences/in-content-old/search.js rename : browser/components/preferences/in-content/search.xul => browser/components/preferences/in-content-old/search.xul rename : browser/components/preferences/in-content/security.js => browser/components/preferences/in-content-old/security.js rename : browser/components/preferences/in-content/security.xul => browser/components/preferences/in-content-old/security.xul rename : browser/components/preferences/in-content/subdialogs.js => browser/components/preferences/in-content-old/subdialogs.js rename : browser/components/preferences/in-content/sync.js => browser/components/preferences/in-content-old/sync.js rename : browser/components/preferences/in-content/sync.xul => browser/components/preferences/in-content-old/sync.xul rename : browser/components/preferences/in-content/tests/.eslintrc.js => browser/components/preferences/in-content-old/tests/.eslintrc.js rename : browser/components/preferences/in-content/tests/browser.ini => browser/components/preferences/in-content-old/tests/browser.ini rename : browser/components/preferences/in-content/tests/browser_advanced_siteData.js => browser/components/preferences/in-content-old/tests/browser_advanced_siteData.js rename : browser/components/preferences/in-content/tests/browser_advanced_update.js => browser/components/preferences/in-content-old/tests/browser_advanced_update.js rename : browser/components/preferences/in-content/tests/browser_applications_selection.js => browser/components/preferences/in-content-old/tests/browser_applications_selection.js rename : browser/components/preferences/in-content/tests/browser_basic_rebuild_fonts_test.js => browser/components/preferences/in-content-old/tests/browser_basic_rebuild_fonts_test.js rename : browser/components/preferences/in-content/tests/browser_bug1018066_resetScrollPosition.js => browser/components/preferences/in-content-old/tests/browser_bug1018066_resetScrollPosition.js rename : browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js => browser/components/preferences/in-content-old/tests/browser_bug1020245_openPreferences_to_paneContent.js rename : browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js => browser/components/preferences/in-content-old/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js rename : browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul => browser/components/preferences/in-content-old/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul rename : browser/components/preferences/in-content/tests/browser_bug410900.js => browser/components/preferences/in-content-old/tests/browser_bug410900.js rename : browser/components/preferences/in-content/tests/browser_bug705422.js => browser/components/preferences/in-content-old/tests/browser_bug705422.js rename : browser/components/preferences/in-content/tests/browser_bug731866.js => browser/components/preferences/in-content-old/tests/browser_bug731866.js rename : browser/components/preferences/in-content/tests/browser_bug795764_cachedisabled.js => browser/components/preferences/in-content-old/tests/browser_bug795764_cachedisabled.js rename : browser/components/preferences/in-content/tests/browser_change_app_handler.js => browser/components/preferences/in-content-old/tests/browser_change_app_handler.js rename : browser/components/preferences/in-content/tests/browser_connection.js => browser/components/preferences/in-content-old/tests/browser_connection.js rename : browser/components/preferences/in-content/tests/browser_connection_bug388287.js => browser/components/preferences/in-content-old/tests/browser_connection_bug388287.js rename : browser/components/preferences/in-content/tests/browser_cookies_exceptions.js => browser/components/preferences/in-content-old/tests/browser_cookies_exceptions.js rename : browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js => browser/components/preferences/in-content-old/tests/browser_defaultbrowser_alwayscheck.js rename : browser/components/preferences/in-content/tests/browser_healthreport.js => browser/components/preferences/in-content-old/tests/browser_healthreport.js rename : browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js => browser/components/preferences/in-content-old/tests/browser_homepages_filter_aboutpreferences.js rename : browser/components/preferences/in-content/tests/browser_notifications_do_not_disturb.js => browser/components/preferences/in-content-old/tests/browser_notifications_do_not_disturb.js rename : browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js => browser/components/preferences/in-content-old/tests/browser_permissions_urlFieldHidden.js rename : browser/components/preferences/in-content/tests/browser_privacypane_1.js => browser/components/preferences/in-content-old/tests/browser_privacypane_1.js rename : browser/components/preferences/in-content/tests/browser_privacypane_3.js => browser/components/preferences/in-content-old/tests/browser_privacypane_3.js rename : browser/components/preferences/in-content/tests/browser_privacypane_4.js => browser/components/preferences/in-content-old/tests/browser_privacypane_4.js rename : browser/components/preferences/in-content/tests/browser_privacypane_5.js => browser/components/preferences/in-content-old/tests/browser_privacypane_5.js rename : browser/components/preferences/in-content/tests/browser_privacypane_8.js => browser/components/preferences/in-content-old/tests/browser_privacypane_8.js rename : browser/components/preferences/in-content/tests/browser_proxy_backup.js => browser/components/preferences/in-content-old/tests/browser_proxy_backup.js rename : browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js => browser/components/preferences/in-content-old/tests/browser_sanitizeOnShutdown_prefLocked.js rename : browser/components/preferences/in-content/tests/browser_searchsuggestions.js => browser/components/preferences/in-content-old/tests/browser_searchsuggestions.js rename : browser/components/preferences/in-content/tests/browser_security.js => browser/components/preferences/in-content-old/tests/browser_security.js rename : browser/components/preferences/in-content/tests/browser_subdialogs.js => browser/components/preferences/in-content-old/tests/browser_subdialogs.js rename : browser/components/preferences/in-content/tests/browser_telemetry.js => browser/components/preferences/in-content-old/tests/browser_telemetry.js rename : browser/components/preferences/in-content/tests/head.js => browser/components/preferences/in-content-old/tests/head.js rename : browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js => browser/components/preferences/in-content-old/tests/privacypane_tests_perwindow.js rename : browser/components/preferences/in-content/tests/site_data_test.html => browser/components/preferences/in-content-old/tests/site_data_test.html rename : browser/components/preferences/in-content/tests/subdialog.xul => browser/components/preferences/in-content-old/tests/subdialog.xul rename : browser/components/preferences/in-content/tests/subdialog2.xul => browser/components/preferences/in-content-old/tests/subdialog2.xul rename : browser/locales/en-US/chrome/browser/preferences/advanced.dtd => browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd rename : browser/locales/en-US/chrome/browser/preferences/applications.dtd => browser/locales/en-US/chrome/browser/preferences-old/applications.dtd rename : browser/locales/en-US/chrome/browser/preferences/containers.dtd => browser/locales/en-US/chrome/browser/preferences-old/containers.dtd rename : browser/locales/en-US/chrome/browser/preferences/containers.properties => browser/locales/en-US/chrome/browser/preferences-old/containers.properties rename : browser/locales/en-US/chrome/browser/preferences/content.dtd => browser/locales/en-US/chrome/browser/preferences-old/content.dtd rename : browser/locales/en-US/chrome/browser/preferences/main.dtd => browser/locales/en-US/chrome/browser/preferences-old/main.dtd rename : browser/locales/en-US/chrome/browser/preferences/preferences.dtd => browser/locales/en-US/chrome/browser/preferences-old/preferences.dtd rename : browser/locales/en-US/chrome/browser/preferences/preferences.properties => browser/locales/en-US/chrome/browser/preferences-old/preferences.properties rename : browser/locales/en-US/chrome/browser/preferences/privacy.dtd => browser/locales/en-US/chrome/browser/preferences-old/privacy.dtd rename : browser/locales/en-US/chrome/browser/preferences/search.dtd => browser/locales/en-US/chrome/browser/preferences-old/search.dtd rename : browser/locales/en-US/chrome/browser/preferences/security.dtd => browser/locales/en-US/chrome/browser/preferences-old/security.dtd rename : browser/locales/en-US/chrome/browser/preferences/sync.dtd => browser/locales/en-US/chrome/browser/preferences-old/sync.dtd rename : browser/locales/en-US/chrome/browser/preferences/tabs.dtd => browser/locales/en-US/chrome/browser/preferences-old/tabs.dtd extra : rebase_source : a2e39a4526b4938d3275978ab54bd24ed8427d1a
125 lines
4.2 KiB
JavaScript
125 lines
4.2 KiB
JavaScript
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
Components.utils.import("resource://gre/modules/Services.jsm");
|
|
Components.utils.import("resource://gre/modules/Task.jsm");
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
const connectionURL = "chrome://browser/content/preferences/connection.xul";
|
|
let closeable = false;
|
|
let finalTest = false;
|
|
|
|
// The changed preferences need to be backed up and restored because this mochitest
|
|
// changes them setting from the default
|
|
let oldNetworkProxyType = Services.prefs.getIntPref("network.proxy.type");
|
|
registerCleanupFunction(function() {
|
|
Services.prefs.setIntPref("network.proxy.type", oldNetworkProxyType);
|
|
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");
|
|
}
|
|
});
|
|
|
|
/*
|
|
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(Task.async(function* tabOpened(aContentWindow) {
|
|
let dialog, dialogClosingPromise;
|
|
let doc, proxyTypePref, sharePref, httpPref, httpPortPref, ftpPref, ftpPortPref;
|
|
|
|
// Convenient function to reset the variables for the new window
|
|
function* setDoc() {
|
|
if (closeable) {
|
|
let dialogClosingEvent = yield dialogClosingPromise;
|
|
ok(dialogClosingEvent, "Connection dialog closed");
|
|
}
|
|
|
|
if (finalTest) {
|
|
gBrowser.removeCurrentTab();
|
|
finish();
|
|
return;
|
|
}
|
|
|
|
dialog = yield openAndLoadSubDialog(connectionURL);
|
|
dialogClosingPromise = waitForEvent(dialog.document.documentElement, "dialogclosing");
|
|
|
|
doc = dialog.document;
|
|
proxyTypePref = doc.getElementById("network.proxy.type");
|
|
sharePref = doc.getElementById("network.proxy.share_proxy_settings");
|
|
httpPref = doc.getElementById("network.proxy.http");
|
|
httpPortPref = doc.getElementById("network.proxy.http_port");
|
|
ftpPref = doc.getElementById("network.proxy.ftp");
|
|
ftpPortPref = doc.getElementById("network.proxy.ftp_port");
|
|
}
|
|
|
|
// This batch of tests should not close the dialog
|
|
yield setDoc();
|
|
|
|
// Testing HTTP port 0 with share on
|
|
proxyTypePref.value = 1;
|
|
sharePref.value = true;
|
|
httpPref.value = "localhost";
|
|
httpPortPref.value = 0;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// Testing HTTP port 0 + FTP port 80 with share off
|
|
sharePref.value = false;
|
|
ftpPref.value = "localhost";
|
|
ftpPortPref.value = 80;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// Testing HTTP port 80 + FTP port 0 with share off
|
|
httpPortPref.value = 80;
|
|
ftpPortPref.value = 0;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// From now on, the dialog should close since we are giving it legitimate inputs.
|
|
// The test will timeout if the onbeforeaccept kicks in erroneously.
|
|
closeable = true;
|
|
|
|
// Both ports 80, share on
|
|
httpPortPref.value = 80;
|
|
ftpPortPref.value = 80;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// HTTP 80, FTP 0, with share on
|
|
yield setDoc();
|
|
proxyTypePref.value = 1;
|
|
sharePref.value = true;
|
|
ftpPref.value = "localhost";
|
|
httpPref.value = "localhost";
|
|
httpPortPref.value = 80;
|
|
ftpPortPref.value = 0;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// HTTP host empty, port 0 with share on
|
|
yield setDoc();
|
|
proxyTypePref.value = 1;
|
|
sharePref.value = true;
|
|
httpPref.value = "";
|
|
httpPortPref.value = 0;
|
|
doc.documentElement.acceptDialog();
|
|
|
|
// HTTP 0, but in no proxy mode
|
|
yield setDoc();
|
|
proxyTypePref.value = 0;
|
|
sharePref.value = true;
|
|
httpPref.value = "localhost";
|
|
httpPortPref.value = 0;
|
|
|
|
// This is the final test, don't spawn another connection window
|
|
finalTest = true;
|
|
doc.documentElement.acceptDialog();
|
|
yield setDoc();
|
|
}));
|
|
}
|