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

Another attempt at fixing bug 822284; r=ehsan

Browse Source
This commit is contained in:
Raymond Lee 2013-02-07 18:16:04 +08:00
parent 0410af4322
commit 3586cda269
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
View File

@ -15,6 +15,9 @@ MOCHITEST_BROWSER_FILES = \
browser_privatebrowsing_certexceptionsui.js \
browser_privatebrowsing_concurrent.js \
browser_privatebrowsing_concurrent_page.html \
browser_privatebrowsing_cookieacceptdialog.js \
browser_privatebrowsing_cookieacceptdialog.html \
browser_privatebrowsing_crh.js \
browser_privatebrowsing_downloadLastDir.js \
browser_privatebrowsing_downloadLastDir_c.js \
browser_privatebrowsing_downloadLastDir_toggle.js \
@ -49,13 +52,4 @@ MOCHITEST_BROWSER_FILES = \
title.sjs \
$(NULL)
# Temporarily disabled on OS X for bug 822284
ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
MOCHITEST_BROWSER_FILES += \
browser_privatebrowsing_cookieacceptdialog.js \
browser_privatebrowsing_cookieacceptdialog.html \
browser_privatebrowsing_crh.js \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

22
browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_cookieacceptdialog.js
View File

@ -117,7 +117,7 @@ function test() {
return;
}
selectedBrowser.removeEventListener("load", onLoad, true);
aCallback(aWin);
executeSoon(function() aCallback(aWin));
}, true);
selectedBrowser.loadURI(BLANK_URL);
});
@ -125,22 +125,22 @@ function test() {
registerCleanupFunction(function() {
Services.prefs.clearUserPref("network.cookie.lifetimePolicy");
windowsToClose.forEach(function(win) {
win.close();
windowsToClose.forEach(function(aWin) {
aWin.close();
});
});
// Ask all cookies
Services.prefs.setIntPref("network.cookie.lifetimePolicy", 1);
testOnWindow(true, function(aPrivWin) {
info("Test on private window");
checkRememberOption(true, aPrivWin, function() {
checkSettingDialog(true, aPrivWin, function() {
testOnWindow(false, function(aWin) {
info("Test on public window");
checkRememberOption(false, aWin, function() {
checkSettingDialog(false, aWin, finish);
testOnWindow(false, function(aWin) {
info("Test on public window");
checkRememberOption(false, aWin, function() {
checkSettingDialog(false, aWin, function() {
testOnWindow(true, function(aPrivWin) {
info("Test on private window");
checkRememberOption(true, aPrivWin, function() {
checkSettingDialog(true, aPrivWin, finish);
});
});
});

12
browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_crh.js
View File

@ -42,17 +42,17 @@ function test() {
};
registerCleanupFunction(function() {
windowsToClose.forEach(function(win) {
win.close();
windowsToClose.forEach(function(aWin) {
aWin.close();
});
});
testOnWindow(true, function(win) {
testOnWindow(true, function(aWin) {
info("Test on private window");
checkDisableOption(true, win, function() {
testOnWindow(false, function(win) {
checkDisableOption(true, aWin, function() {
testOnWindow(false, function(aPrivWin) {
info("Test on public window");
checkDisableOption(false, win, finish);
checkDisableOption(false, aPrivWin, finish);
});
});
});