Bug 806705 - Port browser_bug767836.js to the new per-window PB APIs; r=ehsan

--HG--
rename : browser/base/content/test/browser_bug767836.js => browser/base/content/test/browser_bug767836_perwindowpb.js
This commit is contained in:
Bellindira Castillo [:bellindira] 2012-11-28 21:06:22 -06:00
parent 94853961be
commit f0476a06a1
2 changed files with 85 additions and 1 deletions

View File

@ -158,7 +158,6 @@ _BROWSER_FILES = \
browser_bug735471.js \
browser_bug743421.js \
browser_bug749738.js \
browser_bug767836.js \
browser_bug783614.js \
browser_bug797677.js \
browser_canonizeURL.js \
@ -308,12 +307,14 @@ endif
ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
_BROWSER_FILES += \
browser_bug763468_perwindowpb.js \
browser_bug767836_perwindowpb.js \
browser_private_browsing_window.js \
browser_save_link-perwindowpb.js \
$(NULL)
else
_BROWSER_FILES += \
browser_bug763468.js \
browser_bug767836.js \
browser_save_link.js \
$(NULL)
endif

View File

@ -0,0 +1,83 @@
/* 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/. */
function test() {
//initialization
waitForExplicitFinish();
let newTabPrefName = "browser.newtab.url";
let newTabURL;
let testURL = "http://example.com/";
let mode;
function doTest(aIsPrivateMode, aWindow, aCallback) {
openNewTab(aWindow, function () {
if (aIsPrivateMode) {
mode = "per window private browsing";
newTabURL = "about:privatebrowsing";
} else {
mode = "normal";
newTabURL = Services.prefs.getCharPref(newTabPrefName) || "about:blank";
}
// Check the new tab opened while in normal/private mode
is(aWindow.gBrowser.selectedBrowser.currentURI.spec, newTabURL,
"URL of NewTab should be " + newTabURL + " in " + mode + " mode");
// Set the custom newtab url
Services.prefs.setCharPref(newTabPrefName, testURL);
ok(Services.prefs.prefHasUserValue(newTabPrefName), "Custom newtab url is set");
// Open a newtab after setting the custom newtab url
openNewTab(aWindow, function () {
is(aWindow.gBrowser.selectedBrowser.currentURI.spec, testURL,
"URL of NewTab should be the custom url");
// clear the custom url preference
Services.prefs.clearUserPref(newTabPrefName);
ok(!Services.prefs.prefHasUserValue(newTabPrefName), "No custom newtab url is set");
aWindow.gBrowser.removeTab(aWindow.gBrowser.selectedTab);
aWindow.gBrowser.removeTab(aWindow.gBrowser.selectedTab);
aWindow.close();
aCallback()
});
});
}
function testOnWindow(aIsPrivate, aCallback) {
whenNewWindowLoaded({private: aIsPrivate}, function(win) {
executeSoon(function() aCallback(win));
});
}
// check whether any custom new tab url has been configured
ok(!Services.prefs.prefHasUserValue(newTabPrefName), "No custom newtab url is set");
// test normal mode
testOnWindow(false, function(aWindow) {
doTest(false, aWindow, function() {
// test private mode
testOnWindow(true, function(aWindow) {
doTest(true, aWindow, function() {
finish();
});
});
});
});
}
function openNewTab(aWindow, aCallback) {
// Open a new tab
aWindow.BrowserOpenTab();
let browser = aWindow.gBrowser.selectedBrowser;
if (browser.contentDocument.readyState == "complete") {
executeSoon(aCallback);
return;
}
browser.addEventListener("load", function onLoad() {
browser.removeEventListener("load", onLoad, true);
executeSoon(aCallback);
}, true);
}