зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1094328 - Beef-up regression tests for tab dragging between window types. r=Mossop.
--HG-- extra : rebase_source : e6ce341ea871509562f2a42f6a058e7f8bd417b0
This commit is contained in:
Mike Conley
Родитель
c126077e5b
Коммит
89f15552b6
|
|
@ -2,49 +2,154 @@
|
|||
* 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();
|
||||
const CHROMEUTILS_URL = "chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js";
|
||||
let ChromeUtils = {};
|
||||
|
||||
let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
|
||||
getService(Ci.mozIJSSubScriptLoader);
|
||||
let ChromeUtils = {};
|
||||
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
|
||||
Services.scriptloader.loadSubScript(CHROMEUTILS_URL, ChromeUtils);
|
||||
|
||||
function testOnWindow(aIsPrivate, aCallback) {
|
||||
whenNewWindowLoaded({private: aIsPrivate}, function(win) {
|
||||
executeSoon(function() aCallback(win));
|
||||
});
|
||||
/**
|
||||
* Tests that tabs from Private Browsing windows cannot be dragged
|
||||
* into non-private windows, and vice-versa.
|
||||
*/
|
||||
add_task(function* test_dragging_private_windows() {
|
||||
let normalWin = yield BrowserTestUtils.openNewBrowserWindow();
|
||||
let privateWin =
|
||||
yield BrowserTestUtils.openNewBrowserWindow({private: true});
|
||||
|
||||
let normalTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(normalWin.gBrowser);
|
||||
let privateTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(privateWin.gBrowser);
|
||||
|
||||
let effect = ChromeUtils.synthesizeDrop(normalTab, privateTab,
|
||||
[[{type: TAB_DROP_TYPE, data: normalTab}]],
|
||||
null, normalWin, privateWin);
|
||||
is(effect, "none", "Should not be able to drag a normal tab to a private window");
|
||||
|
||||
effect = ChromeUtils.synthesizeDrop(privateTab, normalTab,
|
||||
[[{type: TAB_DROP_TYPE, data: privateTab}]],
|
||||
null, privateWin, normalWin);
|
||||
is(effect, "none", "Should not be able to drag a private tab to a normal window");
|
||||
|
||||
normalWin.gBrowser.swapBrowsersAndCloseOther(normalTab, privateTab);
|
||||
is(normalWin.gBrowser.tabs.length, 2,
|
||||
"Prevent moving a normal tab to a private tabbrowser");
|
||||
is(privateWin.gBrowser.tabs.length, 2,
|
||||
"Prevent accepting a normal tab in a private tabbrowser");
|
||||
|
||||
privateWin.gBrowser.swapBrowsersAndCloseOther(privateTab, normalTab);
|
||||
is(privateWin.gBrowser.tabs.length, 2,
|
||||
"Prevent moving a private tab to a normal tabbrowser");
|
||||
is(normalWin.gBrowser.tabs.length, 2,
|
||||
"Prevent accepting a private tab in a normal tabbrowser");
|
||||
|
||||
yield BrowserTestUtils.closeWindow(normalWin);
|
||||
yield BrowserTestUtils.closeWindow(privateWin);
|
||||
});
|
||||
|
||||
/**
|
||||
* Tests that tabs from e10s windows cannot be dragged into non-e10s
|
||||
* windows, and vice-versa.
|
||||
*/
|
||||
add_task(function* test_dragging_e10s_windows() {
|
||||
if (!gMultiProcessBrowser) {
|
||||
return;
|
||||
}
|
||||
|
||||
testOnWindow(false, function(aNormalWindow) {
|
||||
testOnWindow(true, function(aPrivateWindow) {
|
||||
// Open a tab in each window
|
||||
let normalTab = aNormalWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
|
||||
let privateTab = aPrivateWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
|
||||
let remoteWin = yield BrowserTestUtils.openNewBrowserWindow({remote: true});
|
||||
let nonRemoteWin = yield BrowserTestUtils.openNewBrowserWindow({remote: false});
|
||||
|
||||
let effect = ChromeUtils.synthesizeDrop(normalTab, privateTab,
|
||||
[[{type: TAB_DROP_TYPE, data: normalTab}]],
|
||||
null, aNormalWindow, aPrivateWindow);
|
||||
is(effect, "none", "Should not be able to drag a normal tab to a private window");
|
||||
let remoteTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(remoteWin.gBrowser);
|
||||
let nonRemoteTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(nonRemoteWin.gBrowser);
|
||||
|
||||
effect = ChromeUtils.synthesizeDrop(privateTab, normalTab,
|
||||
[[{type: TAB_DROP_TYPE, data: privateTab}]],
|
||||
null, aPrivateWindow, aNormalWindow);
|
||||
is(effect, "none", "Should not be able to drag a private tab to a normal window");
|
||||
let effect = ChromeUtils.synthesizeDrop(remoteTab, nonRemoteTab,
|
||||
[[{type: TAB_DROP_TYPE, data: remoteTab}]],
|
||||
null, remoteWin, nonRemoteWin);
|
||||
is(effect, "none", "Should not be able to drag a remote tab to a non-e10s window");
|
||||
|
||||
aNormalWindow.gBrowser.swapBrowsersAndCloseOther(normalTab, privateTab);
|
||||
is(aNormalWindow.gBrowser.tabs.length, 2, "Prevent moving a normal tab to a private tabbrowser");
|
||||
is(aPrivateWindow.gBrowser.tabs.length, 2, "Prevent accepting a normal tab in a private tabbrowser");
|
||||
effect = ChromeUtils.synthesizeDrop(nonRemoteTab, remoteTab,
|
||||
[[{type: TAB_DROP_TYPE, data: nonRemoteTab}]],
|
||||
null, nonRemoteWin, remoteWin);
|
||||
is(effect, "none", "Should not be able to drag a non-remote tab to an e10s window");
|
||||
|
||||
aPrivateWindow.gBrowser.swapBrowsersAndCloseOther(privateTab, normalTab);
|
||||
is(aPrivateWindow.gBrowser.tabs.length, 2, "Prevent moving a private tab to a normal tabbrowser");
|
||||
is(aNormalWindow.gBrowser.tabs.length, 2, "Prevent accepting a private tab in a normal tabbrowser");
|
||||
try {
|
||||
remoteWin.gBrowser.swapBrowsersAndCloseOther(remoteTab, nonRemoteTab);
|
||||
ok(false, "swapBrowsersAndCloseOther should have thrown");
|
||||
} catch(e) {}
|
||||
|
||||
aNormalWindow.close();
|
||||
aPrivateWindow.close();
|
||||
finish();
|
||||
});
|
||||
});
|
||||
}
|
||||
is(remoteWin.gBrowser.tabs.length, 2,
|
||||
"Prevent moving a normal tab to a private tabbrowser");
|
||||
is(nonRemoteWin.gBrowser.tabs.length, 2,
|
||||
"Prevent accepting a normal tab in a private tabbrowser");
|
||||
|
||||
try {
|
||||
nonRemoteWin.gBrowser.swapBrowsersAndCloseOther(nonRemoteTab, remoteTab);
|
||||
ok(false, "swapBrowsersAndCloseOther should have thrown");
|
||||
} catch(e) {}
|
||||
|
||||
is(nonRemoteWin.gBrowser.tabs.length, 2,
|
||||
"Prevent moving a private tab to a normal tabbrowser");
|
||||
is(remoteWin.gBrowser.tabs.length, 2,
|
||||
"Prevent accepting a private tab in a normal tabbrowser");
|
||||
|
||||
yield BrowserTestUtils.closeWindow(remoteWin);
|
||||
yield BrowserTestUtils.closeWindow(nonRemoteWin);
|
||||
});
|
||||
|
||||
/**
|
||||
* Tests that remoteness-blacklisted tabs from e10s windows can
|
||||
* be dragged between e10s windows.
|
||||
*/
|
||||
add_task(function* test_dragging_blacklisted() {
|
||||
if (!gMultiProcessBrowser) {
|
||||
return;
|
||||
}
|
||||
|
||||
let remoteWin1 = yield BrowserTestUtils.openNewBrowserWindow({remote: true});
|
||||
remoteWin1.gBrowser.myID = "remoteWin1";
|
||||
let remoteWin2 = yield BrowserTestUtils.openNewBrowserWindow({remote: true});
|
||||
remoteWin2.gBrowser.myID = "remoteWin2";
|
||||
|
||||
// Anything under chrome://mochitests/content/ will be blacklisted, and
|
||||
// open in the parent process.
|
||||
const BLACKLISTED_URL = getRootDirectory(gTestPath) +
|
||||
"browser_tab_drag_drop_perwindow.js";
|
||||
let blacklistedTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(remoteWin1.gBrowser,
|
||||
BLACKLISTED_URL);
|
||||
|
||||
ok(blacklistedTab.linkedBrowser, "Newly created tab should have a browser.");
|
||||
|
||||
ok(!blacklistedTab.linkedBrowser.isRemoteBrowser,
|
||||
`Expected a non-remote browser for URL: ${BLACKLISTED_URL}`);
|
||||
|
||||
let otherTab =
|
||||
yield BrowserTestUtils.openNewForegroundTab(remoteWin2.gBrowser);
|
||||
|
||||
let effect = ChromeUtils.synthesizeDrop(blacklistedTab, otherTab,
|
||||
[[{type: TAB_DROP_TYPE, data: blacklistedTab}]],
|
||||
null, remoteWin1, remoteWin2);
|
||||
is(effect, "move", "Should be able to drag the blacklisted tab.");
|
||||
|
||||
// The synthesized drop should also do the work of swapping the
|
||||
// browsers, so no need to call swapBrowsersAndCloseOther manually.
|
||||
|
||||
is(remoteWin1.gBrowser.tabs.length, 1,
|
||||
"Should have moved the blacklisted tab out of this window.");
|
||||
is(remoteWin2.gBrowser.tabs.length, 3,
|
||||
"Should have inserted the blacklisted tab into the other window.");
|
||||
|
||||
// The currently selected tab in the second window should be the
|
||||
// one we just dragged in.
|
||||
let draggedBrowser = remoteWin2.gBrowser.selectedBrowser;
|
||||
ok(!draggedBrowser.isRemoteBrowser,
|
||||
"The browser we just dragged in should not be remote.");
|
||||
|
||||
is(draggedBrowser.currentURI.spec, BLACKLISTED_URL,
|
||||
`Expected the URL of the dragged in tab to be ${BLACKLISTED_URL}`);
|
||||
|
||||
yield BrowserTestUtils.closeWindow(remoteWin1);
|
||||
yield BrowserTestUtils.closeWindow(remoteWin2);
|
||||
});
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче