зеркало из https://github.com/mozilla/gecko-dev.git
Bug 852017 - Clean up the private browsing browser-chrome tests; jdm
--HG-- rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_DownloadLastDirWithCPS.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_certexceptionsui.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_concurrent.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_concurrent_page.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent_page.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_cookieacceptdialog.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cookieacceptdialog.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_cookieacceptdialog.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cookieacceptdialog.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_crh.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_crh.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_downloadLastDir.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_downloadLastDir_c.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_downloadLastDir_toggle.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_geoprompt.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_geoprompt_page.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_lastpbcontextexited.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage_before_after.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage_before_after_page.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage_before_after_page2.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page2.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage_page1.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page1.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_localStorage_page2.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page2.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_nonbrowser.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_nonbrowser.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openLocationLastURL.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_openLocationLastURL.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_opendir.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_opendir.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_openlocation.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_openlocation.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_placesTitleNoUpdate.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_placesTitleNoUpdate.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_placestitle.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_popupblocker.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_popupblocker.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_protocolhandler.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_protocolhandler_page.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler_page.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_theming.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_theming.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_ui.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_ui.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_urlbarfocus.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_urlbarfocus.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_windowtitle.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_windowtitle_page.html => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle_page.html rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_zoom.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js rename : browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_zoomrestore.js => browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js rename : browser/components/privatebrowsing/test/browser/perwindow/head.js => browser/components/privatebrowsing/test/browser/head.js rename : browser/components/privatebrowsing/test/browser/perwindow/popup.html => browser/components/privatebrowsing/test/browser/popup.html rename : browser/components/privatebrowsing/test/browser/perwindow/title.sjs => browser/components/privatebrowsing/test/browser/title.sjs extra : rebase_source : 08fa25127187a0f6c56fcf39c38b8fa7a0dc4b88
This commit is contained in:
Ehsan Akhgari
Родитель
19d94654ef
Коммит
ed5a2ed7ba
|
|
@ -12,4 +12,46 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
MODULE = test_privatebrowsing
|
||||
|
||||
MOCHITEST_BROWSER_FILES = \
|
||||
head.js \
|
||||
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 \
|
||||
browser_privatebrowsing_DownloadLastDirWithCPS.js \
|
||||
browser_privatebrowsing_geoprompt.js \
|
||||
browser_privatebrowsing_geoprompt_page.html \
|
||||
browser_privatebrowsing_lastpbcontextexited.js \
|
||||
browser_privatebrowsing_localStorage.js \
|
||||
browser_privatebrowsing_localStorage_before_after.js \
|
||||
browser_privatebrowsing_localStorage_before_after_page.html \
|
||||
browser_privatebrowsing_localStorage_before_after_page2.html \
|
||||
browser_privatebrowsing_localStorage_page1.html \
|
||||
browser_privatebrowsing_localStorage_page2.html \
|
||||
browser_privatebrowsing_nonbrowser.js \
|
||||
browser_privatebrowsing_opendir.js \
|
||||
browser_privatebrowsing_openlocation.js \
|
||||
browser_privatebrowsing_openLocationLastURL.js \
|
||||
browser_privatebrowsing_placestitle.js \
|
||||
browser_privatebrowsing_placesTitleNoUpdate.js \
|
||||
browser_privatebrowsing_placesTitleNoUpdate.html \
|
||||
browser_privatebrowsing_popupblocker.js \
|
||||
browser_privatebrowsing_protocolhandler.js \
|
||||
browser_privatebrowsing_protocolhandler_page.html \
|
||||
browser_privatebrowsing_theming.js \
|
||||
browser_privatebrowsing_ui.js \
|
||||
browser_privatebrowsing_urlbarfocus.js \
|
||||
browser_privatebrowsing_windowtitle.js \
|
||||
browser_privatebrowsing_windowtitle_page.html \
|
||||
browser_privatebrowsing_zoom.js \
|
||||
browser_privatebrowsing_zoomrestore.js \
|
||||
popup.html \
|
||||
title.sjs \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
// Step 4: load a page in the tab from step 2 that checks the value of test is value and the total count in private storage is 1
|
||||
|
||||
function test() {
|
||||
let prefix = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_concurrent_page.html';
|
||||
let prefix = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent_page.html';
|
||||
waitForExplicitFinish();
|
||||
gBrowser.selectedTab = gBrowser.addTab();
|
||||
let non_private_tab = gBrowser.selectedBrowser;
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
function test() {
|
||||
// initialization
|
||||
const TEST_URL = "http://mochi.test:8888/browser/browser/components/" +
|
||||
"privatebrowsing/test/browser/perwindow/" +
|
||||
"privatebrowsing/test/browser/" +
|
||||
"browser_privatebrowsing_cookieacceptdialog.html";
|
||||
const BLANK_URL = "http://mochi.test:8888/";
|
||||
let cp = Cc["@mozilla.org/embedcomp/cookieprompt-service;1"].
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
function test() {
|
||||
const testPageURL = "http://mochi.test:8888/browser/" +
|
||||
"browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_geoprompt_page.html";
|
||||
"browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html";
|
||||
waitForExplicitFinish();
|
||||
|
||||
function checkGeolocation(aPrivateMode, aWindow, aCallback) {
|
||||
|
|
@ -12,7 +12,7 @@ function test() {
|
|||
browser.addEventListener('load', function() {
|
||||
browser.removeEventListener('load', arguments.callee, true);
|
||||
let tab2 = aWindow.gBrowser.selectedTab = aWindow.gBrowser.addTab();
|
||||
browser.contentWindow.location = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/' +
|
||||
browser.contentWindow.location = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/' +
|
||||
'browser_privatebrowsing_localStorage_page2.html';
|
||||
browser.addEventListener('load', function() {
|
||||
browser.removeEventListener('load', arguments.callee, true);
|
||||
|
|
@ -21,7 +21,7 @@ function test() {
|
|||
}, true);
|
||||
}, true);
|
||||
|
||||
browser.loadURI('http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/' +
|
||||
browser.loadURI('http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/' +
|
||||
'browser_privatebrowsing_localStorage_page1.html');
|
||||
});
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@ function test() {
|
|||
waitForExplicitFinish();
|
||||
let windowsToClose = [];
|
||||
let testURI = "about:blank";
|
||||
let prefix = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/';
|
||||
let prefix = 'http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/';
|
||||
|
||||
function doTest(aIsPrivateMode, aWindow, aCallback) {
|
||||
aWindow.gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
|
||||
|
|
@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/PlacesUtils.jsm");
|
|||
|
||||
function test() {
|
||||
waitForExplicitFinish();
|
||||
const TEST_URL = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_placesTitleNoUpdate.html"
|
||||
const TEST_URL = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.html"
|
||||
const TEST_URI = Services.io.newURI(TEST_URL, null, null);
|
||||
const TITLE_1 = "Title 1";
|
||||
const TITLE_2 = "Title 2";
|
||||
|
|
@ -9,7 +9,7 @@ function test() {
|
|||
waitForExplicitFinish();
|
||||
|
||||
const TEST_URL = "http://mochi.test:8888/browser/browser/components/" +
|
||||
"privatebrowsing/test/browser/perwindow/title.sjs";
|
||||
"privatebrowsing/test/browser/title.sjs";
|
||||
let cm = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager);
|
||||
|
||||
function waitForCleanup(aCallback) {
|
||||
|
|
@ -8,7 +8,7 @@ function test() {
|
|||
// initialization
|
||||
waitForExplicitFinish();
|
||||
|
||||
let testURI = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/perwindow/popup.html";
|
||||
let testURI = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/popup.html";
|
||||
let windowsToClose = [];
|
||||
let oldPopupPolicy = gPrefService.getBoolPref("dom.disable_open_during_load");
|
||||
gPrefService.setBoolPref("dom.disable_open_during_load", true);
|
||||
|
|
@ -11,7 +11,7 @@ function test() {
|
|||
let windowsToClose = [];
|
||||
let notificationValue = "Protocol Registration: testprotocol";
|
||||
let testURI = "http://example.com/browser/" +
|
||||
"browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_protocolhandler_page.html";
|
||||
"browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler_page.html";
|
||||
|
||||
function doTest(aIsPrivateMode, aWindow, aCallback) {
|
||||
aWindow.gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
function test() {
|
||||
const testPageURL = "http://mochi.test:8888/browser/" +
|
||||
"browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_windowtitle_page.html";
|
||||
"browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle_page.html";
|
||||
waitForExplicitFinish();
|
||||
requestLongerTimeout(2);
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
|
|
@ -3,15 +3,3 @@
|
|||
# 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/.
|
||||
|
||||
# We have three category of browser-chrome tests:
|
||||
# global: these tests focus on the global PB service implementation.
|
||||
# perwindow: these tests focus on the per-window PB implementation.
|
||||
# obsolete: these tests focus on the global mode, but the functionality
|
||||
# that they are testing is specific to the global mode, and
|
||||
# will never have a per-window counterpart.
|
||||
#
|
||||
# As a transition plan, we have divided the existing tests into the
|
||||
# global and obsolete categories, and we'll then focus on rewriting the
|
||||
# global tests to test the per-window mode.
|
||||
|
||||
DIRS += ['perwindow']
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# 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/.
|
||||
|
||||
DEPTH = @DEPTH@
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
relativesrcdir = @relativesrcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MOCHITEST_BROWSER_FILES = \
|
||||
head.js \
|
||||
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 \
|
||||
browser_privatebrowsing_DownloadLastDirWithCPS.js \
|
||||
browser_privatebrowsing_geoprompt.js \
|
||||
browser_privatebrowsing_geoprompt_page.html \
|
||||
browser_privatebrowsing_lastpbcontextexited.js \
|
||||
browser_privatebrowsing_localStorage.js \
|
||||
browser_privatebrowsing_localStorage_before_after.js \
|
||||
browser_privatebrowsing_localStorage_before_after_page.html \
|
||||
browser_privatebrowsing_localStorage_before_after_page2.html \
|
||||
browser_privatebrowsing_localStorage_page1.html \
|
||||
browser_privatebrowsing_localStorage_page2.html \
|
||||
browser_privatebrowsing_nonbrowser.js \
|
||||
browser_privatebrowsing_opendir.js \
|
||||
browser_privatebrowsing_openlocation.js \
|
||||
browser_privatebrowsing_openLocationLastURL.js \
|
||||
browser_privatebrowsing_placestitle.js \
|
||||
browser_privatebrowsing_placesTitleNoUpdate.js \
|
||||
browser_privatebrowsing_placesTitleNoUpdate.html \
|
||||
browser_privatebrowsing_popupblocker.js \
|
||||
browser_privatebrowsing_protocolhandler.js \
|
||||
browser_privatebrowsing_protocolhandler_page.html \
|
||||
browser_privatebrowsing_theming.js \
|
||||
browser_privatebrowsing_ui.js \
|
||||
browser_privatebrowsing_urlbarfocus.js \
|
||||
browser_privatebrowsing_windowtitle.js \
|
||||
browser_privatebrowsing_windowtitle_page.html \
|
||||
browser_privatebrowsing_zoom.js \
|
||||
browser_privatebrowsing_zoomrestore.js \
|
||||
popup.html \
|
||||
title.sjs \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Загрузка…
Ссылка в новой задаче