mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
Bug 1417383 - Move mochitests from docshell/test/ to docshell/test/mochitest/ to aid ESLint. r=qdot
Depends on D7052 Differential Revision: https://phabricator.services.mozilla.com/D7053 --HG-- rename : docshell/test/bug123696-subframe.html => docshell/test/mochitest/bug123696-subframe.html rename : docshell/test/bug404548-subframe.html => docshell/test/mochitest/bug404548-subframe.html rename : docshell/test/bug404548-subframe_window.html => docshell/test/mochitest/bug404548-subframe_window.html rename : docshell/test/bug413310-post.sjs => docshell/test/mochitest/bug413310-post.sjs rename : docshell/test/bug413310-subframe.html => docshell/test/mochitest/bug413310-subframe.html rename : docshell/test/bug529119-window.html => docshell/test/mochitest/bug529119-window.html rename : docshell/test/bug530396-noref.sjs => docshell/test/mochitest/bug530396-noref.sjs rename : docshell/test/bug530396-subframe.html => docshell/test/mochitest/bug530396-subframe.html rename : docshell/test/bug570341_recordevents.html => docshell/test/mochitest/bug570341_recordevents.html rename : docshell/test/bug668513_redirect.html => docshell/test/mochitest/bug668513_redirect.html rename : docshell/test/bug668513_redirect.html^headers^ => docshell/test/mochitest/bug668513_redirect.html^headers^ rename : docshell/test/bug691547_frame.html => docshell/test/mochitest/bug691547_frame.html rename : docshell/test/dummy_page.html => docshell/test/mochitest/dummy_page.html rename : docshell/test/file_anchor_scroll_after_document_open.html => docshell/test/mochitest/file_anchor_scroll_after_document_open.html rename : docshell/test/file_bfcache_plus_hash_1.html => docshell/test/mochitest/file_bfcache_plus_hash_1.html rename : docshell/test/file_bfcache_plus_hash_2.html => docshell/test/mochitest/file_bfcache_plus_hash_2.html rename : docshell/test/file_bug1121701_1.html => docshell/test/mochitest/file_bug1121701_1.html rename : docshell/test/file_bug1121701_2.html => docshell/test/mochitest/file_bug1121701_2.html rename : docshell/test/file_bug1151421.html => docshell/test/mochitest/file_bug1151421.html rename : docshell/test/file_bug1186774.html => docshell/test/mochitest/file_bug1186774.html rename : docshell/test/file_bug1450164.html => docshell/test/mochitest/file_bug1450164.html rename : docshell/test/file_bug385434_1.html => docshell/test/mochitest/file_bug385434_1.html rename : docshell/test/file_bug385434_2.html => docshell/test/mochitest/file_bug385434_2.html rename : docshell/test/file_bug385434_3.html => docshell/test/mochitest/file_bug385434_3.html rename : docshell/test/file_bug475636.sjs => docshell/test/mochitest/file_bug475636.sjs rename : docshell/test/file_bug509055.html => docshell/test/mochitest/file_bug509055.html rename : docshell/test/file_bug511449.html => docshell/test/mochitest/file_bug511449.html rename : docshell/test/file_bug540462.html => docshell/test/mochitest/file_bug540462.html rename : docshell/test/file_bug580069_1.html => docshell/test/mochitest/file_bug580069_1.html rename : docshell/test/file_bug580069_2.sjs => docshell/test/mochitest/file_bug580069_2.sjs rename : docshell/test/file_bug590573_1.html => docshell/test/mochitest/file_bug590573_1.html rename : docshell/test/file_bug590573_2.html => docshell/test/mochitest/file_bug590573_2.html rename : docshell/test/file_bug598895_1.html => docshell/test/mochitest/file_bug598895_1.html rename : docshell/test/file_bug598895_2.html => docshell/test/mochitest/file_bug598895_2.html rename : docshell/test/file_bug634834.html => docshell/test/mochitest/file_bug634834.html rename : docshell/test/file_bug598895_1.html => docshell/test/mochitest/file_bug637644_1.html rename : docshell/test/file_bug598895_2.html => docshell/test/mochitest/file_bug637644_2.html rename : docshell/test/file_bug640387.html => docshell/test/mochitest/file_bug640387.html rename : docshell/test/file_bug653741.html => docshell/test/mochitest/file_bug653741.html rename : docshell/test/file_bug660404 => docshell/test/mochitest/file_bug660404 rename : docshell/test/file_bug660404-1.html => docshell/test/mochitest/file_bug660404-1.html rename : docshell/test/file_bug660404^headers^ => docshell/test/mochitest/file_bug660404^headers^ rename : docshell/test/file_bug653741.html => docshell/test/mochitest/file_bug662170.html rename : docshell/test/file_bug668513.html => docshell/test/mochitest/file_bug668513.html rename : docshell/test/file_bug669671.sjs => docshell/test/mochitest/file_bug669671.sjs rename : docshell/test/file_bug675587.html => docshell/test/mochitest/file_bug675587.html rename : docshell/test/file_bug680257.html => docshell/test/mochitest/file_bug680257.html rename : docshell/test/file_bug703855.html => docshell/test/mochitest/file_bug703855.html rename : docshell/test/file_bug728939.html => docshell/test/mochitest/file_bug728939.html rename : docshell/test/file_close_onpagehide1.html => docshell/test/mochitest/file_close_onpagehide1.html rename : docshell/test/file_close_onpagehide2.html => docshell/test/mochitest/file_close_onpagehide2.html rename : docshell/test/file_framedhistoryframes.html => docshell/test/mochitest/file_framedhistoryframes.html rename : docshell/test/file_pushState_after_document_open.html => docshell/test/mochitest/file_pushState_after_document_open.html rename : docshell/test/historyframes.html => docshell/test/mochitest/historyframes.html rename : docshell/test/mochitest.ini => docshell/test/mochitest/mochitest.ini rename : docshell/test/start_historyframe.html => docshell/test/mochitest/start_historyframe.html rename : docshell/test/test_anchor_scroll_after_document_open.html => docshell/test/mochitest/test_anchor_scroll_after_document_open.html rename : docshell/test/test_bfcache_plus_hash.html => docshell/test/mochitest/test_bfcache_plus_hash.html rename : docshell/test/test_bug1045096.html => docshell/test/mochitest/test_bug1045096.html rename : docshell/test/test_bug1121701.html => docshell/test/mochitest/test_bug1121701.html rename : docshell/test/test_bug1151421.html => docshell/test/mochitest/test_bug1151421.html rename : docshell/test/test_bug1186774.html => docshell/test/mochitest/test_bug1186774.html rename : docshell/test/test_bug123696.html => docshell/test/mochitest/test_bug123696.html rename : docshell/test/test_bug1450164.html => docshell/test/mochitest/test_bug1450164.html rename : docshell/test/test_bug384014.html => docshell/test/mochitest/test_bug384014.html rename : docshell/test/test_bug385434.html => docshell/test/mochitest/test_bug385434.html rename : docshell/test/test_bug387979.html => docshell/test/mochitest/test_bug387979.html rename : docshell/test/test_bug402210.html => docshell/test/mochitest/test_bug402210.html rename : docshell/test/test_bug404548.html => docshell/test/mochitest/test_bug404548.html rename : docshell/test/test_bug413310.html => docshell/test/mochitest/test_bug413310.html rename : docshell/test/test_bug475636.html => docshell/test/mochitest/test_bug475636.html rename : docshell/test/test_bug509055.html => docshell/test/mochitest/test_bug509055.html rename : docshell/test/test_bug511449.html => docshell/test/mochitest/test_bug511449.html rename : docshell/test/test_bug529119-1.html => docshell/test/mochitest/test_bug529119-1.html rename : docshell/test/test_bug529119-2.html => docshell/test/mochitest/test_bug529119-2.html rename : docshell/test/test_bug530396.html => docshell/test/mochitest/test_bug530396.html rename : docshell/test/test_bug540462.html => docshell/test/mochitest/test_bug540462.html rename : docshell/test/test_bug551225.html => docshell/test/mochitest/test_bug551225.html rename : docshell/test/test_bug570341.html => docshell/test/mochitest/test_bug570341.html rename : docshell/test/test_bug580069.html => docshell/test/mochitest/test_bug580069.html rename : docshell/test/test_bug590573.html => docshell/test/mochitest/test_bug590573.html rename : docshell/test/test_bug598895.html => docshell/test/mochitest/test_bug598895.html rename : docshell/test/test_bug634834.html => docshell/test/mochitest/test_bug634834.html rename : docshell/test/test_bug637644.html => docshell/test/mochitest/test_bug637644.html rename : docshell/test/test_bug640387_1.html => docshell/test/mochitest/test_bug640387_1.html rename : docshell/test/test_bug640387_2.html => docshell/test/mochitest/test_bug640387_2.html rename : docshell/test/test_bug653741.html => docshell/test/mochitest/test_bug653741.html rename : docshell/test/test_bug660404.html => docshell/test/mochitest/test_bug660404.html rename : docshell/test/test_bug662170.html => docshell/test/mochitest/test_bug662170.html rename : docshell/test/test_bug668513.html => docshell/test/mochitest/test_bug668513.html rename : docshell/test/test_bug669671.html => docshell/test/mochitest/test_bug669671.html rename : docshell/test/test_bug675587.html => docshell/test/mochitest/test_bug675587.html rename : docshell/test/test_bug680257.html => docshell/test/mochitest/test_bug680257.html rename : docshell/test/test_bug691547.html => docshell/test/mochitest/test_bug691547.html rename : docshell/test/test_bug694612.html => docshell/test/mochitest/test_bug694612.html rename : docshell/test/test_bug703855.html => docshell/test/mochitest/test_bug703855.html rename : docshell/test/test_bug728939.html => docshell/test/mochitest/test_bug728939.html rename : docshell/test/test_bug797909.html => docshell/test/mochitest/test_bug797909.html rename : docshell/test/test_close_onpagehide_by_history_back.html => docshell/test/mochitest/test_close_onpagehide_by_history_back.html rename : docshell/test/test_close_onpagehide_by_window_close.html => docshell/test/mochitest/test_close_onpagehide_by_window_close.html rename : docshell/test/test_forceinheritprincipal_overrule_owner.html => docshell/test/mochitest/test_forceinheritprincipal_overrule_owner.html rename : docshell/test/test_framedhistoryframes.html => docshell/test/mochitest/test_framedhistoryframes.html rename : docshell/test/test_pushState_after_document_open.html => docshell/test/mochitest/test_pushState_after_document_open.html rename : docshell/test/test_triggeringprincipal_location_seturi.html => docshell/test/mochitest/test_triggeringprincipal_location_seturi.html rename : docshell/test/test_windowedhistoryframes.html => docshell/test/mochitest/test_windowedhistoryframes.html rename : docshell/test/url1_historyframe.html => docshell/test/mochitest/url1_historyframe.html rename : docshell/test/url2_historyframe.html => docshell/test/mochitest/url2_historyframe.html extra : moz-landing-system : lando
This commit is contained in:
Mark Banner
parent
bf7ee7e818
commit
88e4ab36f7
@ -21,7 +21,7 @@ XPCSHELL_TESTS_MANIFESTS += [
|
||||
|
||||
MOCHITEST_MANIFESTS += [
|
||||
'test/iframesandbox/mochitest.ini',
|
||||
'test/mochitest.ini',
|
||||
'test/mochitest/mochitest.ini',
|
||||
'test/navigation/mochitest.ini',
|
||||
]
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ function getContent() {
|
||||
return gFrame.contentDocument.getElementById("text").textContent;
|
||||
}
|
||||
|
||||
var BASE_URI = "http://mochi.test:8888/tests/docshell/test/";
|
||||
var BASE_URI = "http://mochi.test:8888/tests/docshell/test/mochitest/";
|
||||
var START = BASE_URI + "start_historyframe.html";
|
||||
var URL1 = BASE_URI + "url1_historyframe.html";
|
||||
var URL2 = BASE_URI + "url2_historyframe.html";
|
||||
@ -2,7 +2,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Test bug 529119</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
|
||||
<script class="testbody" type="text/javascript">
|
||||
@ -10,7 +10,7 @@
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SimpleTest.requestFlakyTimeout("untriaged");
|
||||
|
||||
var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
|
||||
var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
|
||||
var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
|
||||
|
||||
var w = null;
|
||||
@ -33,7 +33,7 @@ function pollForPage(f, w)
|
||||
catch (ex) {
|
||||
haveErrorPage = true;
|
||||
}
|
||||
|
||||
|
||||
if (iterationsLeft == 0 || haveErrorPage) {
|
||||
window.clearInterval(int);
|
||||
f(iterationsLeft > 0);
|
||||
@ -51,35 +51,35 @@ function windowLoaded()
|
||||
window.setTimeout(function() {
|
||||
w.location.href = faultyURL;
|
||||
}, 0);
|
||||
|
||||
|
||||
phase = 1;
|
||||
|
||||
pollForPage(function(succeeded) {
|
||||
ok(succeeded, "Waiting for error page succeeded");
|
||||
|
||||
/* 3. now, while we are on the error page, try to reload it, actually
|
||||
|
||||
/* 3. now, while we are on the error page, try to reload it, actually
|
||||
click the "Try Again" button */
|
||||
SpecialPowers.wrap(w).location.reload();
|
||||
|
||||
pollForPage(function(succeeded) {
|
||||
ok(succeeded, "Waiting for error page succeeded");
|
||||
|
||||
|
||||
/* 4-finish, check we are still on the error page */
|
||||
is(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
|
||||
isnot(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
|
||||
is(gotWrongPageOnTryAgainClick, false,
|
||||
is(gotWrongPageOnTryAgainClick, false,
|
||||
"Must not get www.example.com page on reload of an error page");
|
||||
w.close();
|
||||
SimpleTest.finish();
|
||||
}, w);
|
||||
}, w);
|
||||
break;
|
||||
|
||||
|
||||
case 1:
|
||||
/* 4-check, we must not get here! */
|
||||
gotWrongPageOnTryAgainClick = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function startTest()
|
||||
@ -2,7 +2,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Test bug 529119</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
|
||||
<script class="testbody" type="text/javascript">
|
||||
@ -10,7 +10,7 @@
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SimpleTest.requestFlakyTimeout("untriaged");
|
||||
|
||||
var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
|
||||
var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
|
||||
var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
|
||||
|
||||
var w = null;
|
||||
@ -25,7 +25,7 @@ function pollForPage(expectErrorPage, f, w)
|
||||
var iterationsLeft = 200;
|
||||
var int = window.setInterval(function() {
|
||||
iterationsLeft--;
|
||||
|
||||
|
||||
var haveErrorPage = false;
|
||||
try {
|
||||
var title = w.document.title;
|
||||
@ -33,7 +33,7 @@ function pollForPage(expectErrorPage, f, w)
|
||||
catch (ex) {
|
||||
haveErrorPage = true;
|
||||
}
|
||||
|
||||
|
||||
if (iterationsLeft == 0 || expectErrorPage == haveErrorPage) {
|
||||
window.clearInterval(int);
|
||||
f(iterationsLeft > 0);
|
||||
@ -51,7 +51,7 @@ function windowLoaded()
|
||||
isWindowLoaded = true;
|
||||
|
||||
/* 2. We have successfully loaded a page, now go to a faulty URL */
|
||||
// XXX The test fails when we change the location synchronously
|
||||
// XXX The test fails when we change the location synchronously
|
||||
window.setTimeout(function() {
|
||||
w.location.href = faultyURL;
|
||||
}, 0);
|
||||
@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=530396
|
||||
|
||||
<p>
|
||||
|
||||
<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/bug530396-subframe.html"></iframe>
|
||||
<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/mochitest/bug530396-subframe.html"></iframe>
|
||||
|
||||
<pre id="test">
|
||||
<script class="testbody" type="text/javascript">
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user