mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 1271240 - Part 2: Add test case. r=smaug
MozReview-Commit-ID: HL7DnAOf7rO --HG-- extra : rebase_source : 4c6d721028bd3621d20609795191796bd7a3bff9
This commit is contained in:
Samael Wang
parent
d6e0c31eda
commit
fccbaeb33d
@ -9,6 +9,8 @@ support-files =
|
||||
window_bug583948.xul
|
||||
window_bug757137.xul
|
||||
1061864.html
|
||||
file_bug1271240_local.xul
|
||||
file_bug1271240_remote.xul
|
||||
|
||||
[test_bug199692.xul]
|
||||
[test_bug233643.xul]
|
||||
@ -32,3 +34,6 @@ support-files =
|
||||
[test_bug1061864_2.xul]
|
||||
[test_bug1070049_throw_from_script.xul]
|
||||
[test_import_xul_to_content.xul]
|
||||
[test_bug1271240_local.xul]
|
||||
[test_bug1271240_remote.xul]
|
||||
skip-if = !e10s
|
||||
|
||||
72
dom/xul/test/file_bug1271240_local.xul
Normal file
72
dom/xul/test/file_bug1271240_local.xul
Normal file
@ -0,0 +1,72 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1271240
|
||||
-->
|
||||
<window title="Mozilla Bug 1271240"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="run();">
|
||||
|
||||
<!-- test code goes here -->
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
function ok(cond, msg) {
|
||||
opener.wrappedJSObject.ok(cond, msg);
|
||||
}
|
||||
|
||||
function is(actual, expected, msg) {
|
||||
opener.wrappedJSObject.is(actual, expected, msg);
|
||||
}
|
||||
|
||||
/** Test for Bug 1271240 **/
|
||||
function run() {
|
||||
// test non-remote, non-prerendered browser
|
||||
createBrowser(false, false)
|
||||
.then(browser => verifyBrowser(browser, false, false))
|
||||
|
||||
// test non-remote, prerendered browser
|
||||
.then(() => createBrowser(true, false))
|
||||
.then(browser => verifyBrowser(browser, true, false))
|
||||
.then(browser => makePrerenderedBrowserActive(browser))
|
||||
.then(browser => verifyBrowser(browser, false, false))
|
||||
|
||||
// finish test
|
||||
.then(() => {
|
||||
opener.postMessage('finish', '*');
|
||||
window.close();
|
||||
});
|
||||
}
|
||||
|
||||
function createBrowser(prerendered, remote) {
|
||||
return new Promise(resolve => {
|
||||
var browser = document.createElement('browser');
|
||||
browser.setAttribute('type', 'content');
|
||||
browser.setAttribute('prerendered', prerendered);
|
||||
browser.setAttribute('remote', remote);
|
||||
document.documentElement.appendChild(browser);
|
||||
browser.loadURI('example.com');
|
||||
resolve(browser);
|
||||
});
|
||||
}
|
||||
|
||||
function verifyBrowser(browser, prerendered, remote) {
|
||||
var docShellOrTabParent = remote ?
|
||||
browser.frameLoader.tabParent : browser.frameLoader.docShell;
|
||||
ok(docShellOrTabParent, 'docShellOrTabParent should not be null');
|
||||
is(docShellOrTabParent.isPrerendered, prerendered,
|
||||
'isPrerendered should be ' + prerendered);
|
||||
return browser;
|
||||
}
|
||||
|
||||
function makePrerenderedBrowserActive(browser) {
|
||||
browser.makePrerenderedBrowserActive();
|
||||
return browser;
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
<!-- <browser type="content-primary" flex="1" id="content" />
|
||||
<browser type="content-primary" flex="1" id="content-remote" remote="true" /> -->
|
||||
</window>
|
||||
72
dom/xul/test/file_bug1271240_remote.xul
Normal file
72
dom/xul/test/file_bug1271240_remote.xul
Normal file
@ -0,0 +1,72 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1271240
|
||||
-->
|
||||
<window title="Mozilla Bug 1271240"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="run();">
|
||||
|
||||
<!-- test code goes here -->
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
function ok(cond, msg) {
|
||||
opener.wrappedJSObject.ok(cond, msg);
|
||||
}
|
||||
|
||||
function is(actual, expected, msg) {
|
||||
opener.wrappedJSObject.is(actual, expected, msg);
|
||||
}
|
||||
|
||||
/** Test for Bug 1271240 **/
|
||||
function run() {
|
||||
// test remote, non-prerendered browser
|
||||
createBrowser(false, true)
|
||||
.then(browser => verifyBrowser(browser, false, true))
|
||||
|
||||
// test remote, prerendered browser
|
||||
.then(() => createBrowser(true, true))
|
||||
.then(browser => verifyBrowser(browser, true, true))
|
||||
.then(browser => makePrerenderedBrowserActive(browser))
|
||||
.then(browser => verifyBrowser(browser, false, true))
|
||||
|
||||
// finish test
|
||||
.then(() => {
|
||||
opener.postMessage('finish', '*');
|
||||
window.close();
|
||||
});
|
||||
}
|
||||
|
||||
function createBrowser(prerendered, remote) {
|
||||
return new Promise(resolve => {
|
||||
var browser = document.createElement('browser');
|
||||
browser.setAttribute('type', 'content');
|
||||
browser.setAttribute('prerendered', prerendered);
|
||||
browser.setAttribute('remote', remote);
|
||||
document.documentElement.appendChild(browser);
|
||||
browser.loadURI('example.com');
|
||||
resolve(browser);
|
||||
});
|
||||
}
|
||||
|
||||
function verifyBrowser(browser, prerendered, remote) {
|
||||
var docShellOrTabParent = remote ?
|
||||
browser.frameLoader.tabParent : browser.frameLoader.docShell;
|
||||
ok(docShellOrTabParent, 'docShellOrTabParent should not be null');
|
||||
is(docShellOrTabParent.isPrerendered, prerendered,
|
||||
'isPrerendered should be ' + prerendered);
|
||||
return browser;
|
||||
}
|
||||
|
||||
function makePrerenderedBrowserActive(browser) {
|
||||
browser.makePrerenderedBrowserActive();
|
||||
return browser;
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
<!-- <browser type="content-primary" flex="1" id="content" />
|
||||
<browser type="content-primary" flex="1" id="content-remote" remote="true" /> -->
|
||||
</window>
|
||||
38
dom/xul/test/test_bug1271240_local.xul
Normal file
38
dom/xul/test/test_bug1271240_local.xul
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1271240
|
||||
-->
|
||||
<window title="Mozilla Bug 1271240"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="loadTest();">
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||
|
||||
<!-- test results are displayed in the html:body -->
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1271240"
|
||||
target="_blank">Mozilla Bug 1271240</a>
|
||||
</body>
|
||||
|
||||
<!-- test code goes here -->
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
/** Test for Bug 1271240 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
window.addEventListener('message', (event) => {
|
||||
if (event.data == 'finish') {
|
||||
SimpleTest.finish();
|
||||
}
|
||||
});
|
||||
|
||||
function loadTest() {
|
||||
window.open("file_bug1271240_local.xul", "", "chrome");
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
</window>
|
||||
38
dom/xul/test/test_bug1271240_remote.xul
Normal file
38
dom/xul/test/test_bug1271240_remote.xul
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1271240
|
||||
-->
|
||||
<window title="Mozilla Bug 1271240"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="loadTest();">
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||
|
||||
<!-- test results are displayed in the html:body -->
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1271240"
|
||||
target="_blank">Mozilla Bug 1271240</a>
|
||||
</body>
|
||||
|
||||
<!-- test code goes here -->
|
||||
<script type="application/javascript">
|
||||
<![CDATA[
|
||||
|
||||
/** Test for Bug 1271240 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
window.addEventListener('message', (event) => {
|
||||
if (event.data == 'finish') {
|
||||
SimpleTest.finish();
|
||||
}
|
||||
});
|
||||
|
||||
function loadTest() {
|
||||
window.open("file_bug1271240_remote.xul", "", "chrome");
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
</window>
|
||||
Loading…
Reference in New Issue
Block a user