Bug 847279 - Fix hardcoded path names in mochitests to match relativesrcdir. r=mbrubeck

This commit is contained in:
Ben Kelly 2013-04-17 18:00:14 -04:00
Родитель 2c6dd08daf
Коммит 1f13fb9ca7
52 изменённых файлов: 73 добавлений и 71 удалений

Просмотреть файл

@ -1,6 +1,6 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
response.setHeader("Location", "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt");
response.setHeader("Content-Type", "text/html");
}

Просмотреть файл

@ -9,7 +9,7 @@
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
<script type="application/javascript"
src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
</body>

Просмотреть файл

@ -9,7 +9,7 @@
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
<script type="application/javascript"
src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
</body>

Просмотреть файл

@ -8,6 +8,8 @@
<title>NPAPI Private Mode Tests</title>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
<script type="application/javascript"
src="chrome://mochikit/content/chrome-harness.js" />
<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
<embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
@ -52,7 +54,7 @@ function runTestsCallback() {
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
var contentPage = "chrome://mochitests/content/chrome/dom/plugins/test/privatemode_perwindowpb.xul";
var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xul";
function testOnWindow(aIsPrivate, aCallback) {
var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});

Просмотреть файл

@ -12,7 +12,7 @@
var p = document.getElementById("plugin1");
var redirectingURL = "307-xo-redirect.sjs";
var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
var expectedWriteURL = "";
var expectedNotifyStatus = -1;

Просмотреть файл

@ -24,7 +24,7 @@
const nsIWebProgress = Components.interfaces.nsIWebProgress;
const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
function ProgressListener() {
}

Просмотреть файл

@ -15,7 +15,7 @@
<input id="i3" onkeydown="gKeyDown3++; frames[0].document.getElementById('i4').focus();"
onkeypress="gKeyPress3++;" onkeyup="gKeyUp3++;"/>
<iframe id="iframe" src="http://example.org/chrome/layout/base/test/chrome/bug551434_childframe.html"></iframe>
<iframe id="iframe" src="http://example.org/chrome/layout/base/tests/chrome/bug551434_childframe.html"></iframe>
<script class="testbody" type="text/javascript">

Просмотреть файл

@ -13,7 +13,7 @@
window.setTimeout(function ()
{
window.location =
"https://example.com/tests/security/ssl/mixedcontent/bug383369step3.html?runtest";
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html?runtest";
}, 0);
}

Просмотреть файл

@ -8,6 +8,6 @@
<script>
document.write(location.href);
</script>
<iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
<iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
</body>
</html>

Просмотреть файл

@ -1,6 +1,6 @@
<!DOCTYPE HTML>
<META http-equiv="Refresh"
Content="0; URL=http://example.com/tests/security/ssl/mixedcontent/iframe.html">
Content="0; URL=http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html">
<html>
<body>
Redirecting by meta tag...

Просмотреть файл

@ -1,5 +1,5 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/iframe.html");
response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
}

Просмотреть файл

@ -1,5 +1,5 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/iframe.html");
response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
}

Просмотреть файл

@ -1,5 +1,5 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
}

Просмотреть файл

@ -1,5 +1,5 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
}

Просмотреть файл

@ -128,8 +128,8 @@ function finish()
window.setTimeout(function()
{
window.location.assign(navigateToInsecure ?
"http://example.com/tests/security/ssl/mixedcontent/backward.html" :
"https://example.com/tests/security/ssl/mixedcontent/backward.html");
"http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html" :
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html");
}, 0);
}
else

Просмотреть файл

@ -1,5 +1,5 @@
function handleRequest(request, response)
{
response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/emptyimage.sjs");
response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs");
}

Просмотреть файл

@ -16,7 +16,7 @@
window.setTimeout(function()
{
var newElement = document.createElement("script");
newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
newElement.src= "http://example.org/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js";
document.body.appendChild(newElement);
}, 0);
}

Просмотреть файл

@ -28,6 +28,6 @@
</head>
<body>
<img src="https://example.com/tests/security/ssl/mixedcontent/redirecttoemptyimage.sjs" />
<img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs" />
</body>
</html>

Просмотреть файл

@ -21,7 +21,7 @@
{
var img1 = document.getElementById("img1");
img1.addEventListener("load", onLoadFunction, false);
img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
img1.src = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
}
function runTest()
@ -40,6 +40,6 @@
</head>
<body>
<img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
<img id="img1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
</body>
</html>

Просмотреть файл

@ -16,7 +16,7 @@
function runTest()
{
window.location = "https://example.com/tests/security/ssl/mixedcontent/nocontent.sjs";
window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
window.setTimeout(function() {
isSecurityState("insecure", "location.href doesn't effect the security state");
is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");

Просмотреть файл

@ -12,7 +12,7 @@
<style type="text/css">
p:before
{
content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
}
</style>

Просмотреть файл

@ -13,7 +13,7 @@
<style type="text/css">
p
{
content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
}
</style>

Просмотреть файл

@ -20,7 +20,7 @@
{
isSecurityState("secure");
document.getElementById("para").style.content =
"url('http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg')";
"url('http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg')";
waitForSecurityState("broken", function()
{

Просмотреть файл

@ -30,7 +30,7 @@
<body>
<script class="testbody" type="text/javascript">
document.write(
"<img src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />");
"<img src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />");
</script>
</body>
</html>

Просмотреть файл

@ -32,7 +32,7 @@
<body>
<script class="testbody" type="text/javascript">
document.write(
"<iframe src='http://example.com/tests/security/ssl/mixedcontent/iframe.html'></iframe>");
"<iframe src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html'></iframe>");
</script>
</body>
</html>

Просмотреть файл

@ -18,7 +18,7 @@
window.setTimeout(function() {
// Don't do this synchronously from onload handler
document.getElementById("image1").src =
"http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
"http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
}, 0);
waitForSecurityState("broken", function()
@ -31,7 +31,7 @@
function afterNavigationTest()
{
is(document.getElementById("image1").src,
"https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
"img.src secure again");
isSecurityState("secure", "security full after navigation");
finish();
@ -41,6 +41,6 @@
</head>
<body>
<img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -22,7 +22,7 @@
try
{
var req = new XMLHttpRequest();
req.open("GET", "http://example.com/tests/security/ssl/mixedcontent/alloworigin.sjs", false);
req.open("GET", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs", false);
req.send(null);
// Change should be immediate, the request was sent synchronously

Просмотреть файл

@ -18,7 +18,7 @@
{
isSecurityState("secure");
document.body.background =
"http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
"http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
waitForSecurityState("broken", function()
{
@ -30,7 +30,7 @@
function afterNavigationTest()
{
is(document.body.background,
"https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
"document backround secure again");
isSecurityState("secure", "secure after re-navigation");
finish();
@ -39,6 +39,6 @@
</script>
</head>
<body background="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
<body background="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
</body>
</html>

Просмотреть файл

@ -25,7 +25,7 @@
}
iframe.src =
"https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs";
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs";
}
function afterNavigationTest()
@ -38,6 +38,6 @@
</head>
<body>
<iframe id="iframe1" src="https://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
<iframe id="iframe1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
</body>
</html>

Просмотреть файл

@ -18,7 +18,7 @@
{
isSecurityState("secure");
document.getElementById("image1").src =
"http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
"http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
window.setTimeout(function() {
isSecurityState("broken", "src='http://...' changed to broken");
@ -29,7 +29,7 @@
function afterNavigationTest()
{
is(document.getElementById("image1").src,
"https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
"img.src secure again");
isSecurityState("secure", "security full after navigation");
finish();
@ -39,6 +39,6 @@
</head>
<body>
<img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -13,7 +13,7 @@
<script class="testbody" type="text/javascript">
(new Image()).src =
"http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
"http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
function runTest()
{

Просмотреть файл

@ -12,7 +12,7 @@
{
isSecurityState("secure");
document.getElementById("image1").src =
"https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs";
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs";
window.setTimeout(function() {
isSecurityState("broken", "src='redirect to unsecure' changed to broken");
@ -23,7 +23,7 @@
function afterNavigationTest()
{
is(document.getElementById("image1").src,
"https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
"https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
"img.src secure again");
isSecurityState("secure", "security full after navigation");
finish();
@ -33,6 +33,6 @@
</head>
<body>
<img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -19,7 +19,7 @@
window.setTimeout(function()
{
document.getElementById("buddy").innerHTML =
"<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
"<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
}, 1);
waitForSecurityState("broken", function()

Просмотреть файл

@ -17,7 +17,7 @@
isSecurityState("secure");
document.getElementById("buddy").innerHTML =
"<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
"<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
window.setTimeout(function() {
isSecurityState("broken", "innerHTML loading insecure changed to broken");

Просмотреть файл

@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<link rel="stylesheet" type="text/css"
href="https://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
href="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
<script class="testbody" type="text/javascript">
@ -34,8 +34,8 @@
</head>
<body>
<img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img src="https://example.com/tests/security/ssl/mixedcontent/imgsecredirect.sjs" />
<iframe src="https://example.com/tests/security/ssl/mixedcontent/iframesecredirect.sjs" />
<img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
<img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs" />
<iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs" />
</body>
</html>

Просмотреть файл

@ -30,6 +30,6 @@
</head>
<body>
<img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -29,6 +29,6 @@
</script>
</head>
<body background="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
<body background="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
</body>
</html>

Просмотреть файл

@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<link rel="stylesheet" type="text/css"
href="http://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
href="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
<script class="testbody" type="text/javascript">

Просмотреть файл

@ -30,6 +30,6 @@
</head>
<body>
<iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
<iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
</body>
</html>

Просмотреть файл

@ -30,6 +30,6 @@
</head>
<body>
<iframe src="https://example.com/tests/security/ssl/mixedcontent/iframe2.html"></iframe>
<iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html"></iframe>
</body>
</html>

Просмотреть файл

@ -30,7 +30,7 @@
</head>
<body>
<iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeMetaRedirect.html"></iframe>
<iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html"></iframe>
</body>
</html>

Просмотреть файл

@ -30,7 +30,7 @@
</head>
<body>
<iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs"></iframe>
<iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs"></iframe>
</body>
</html>

Просмотреть файл

@ -28,6 +28,6 @@
</head>
<body>
<img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -30,6 +30,6 @@
</head>
<body>
<iframe src="http://example.com/tests/security/ssl/mixedcontent/unsecureIframe.html"></iframe>
<iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html"></iframe>
</body>
</html>

Просмотреть файл

@ -30,6 +30,6 @@
</head>
<body>
<img src="https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs" />
<img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs" />
</body>
</html>

Просмотреть файл

@ -4,6 +4,6 @@
</head>
<body>
<img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
<img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
</body>
</html>

Просмотреть файл

@ -28,6 +28,6 @@
</head>
<body>
<img src="http://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
<img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
</body>
</html>

Просмотреть файл

@ -12,7 +12,7 @@
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
const STSPATH = "/tests/security/ssl/stricttransportsecurity";
const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
// initialized manually here
var testsleft = {'plain': 4, 'subdom': 4};

Просмотреть файл

@ -14,10 +14,10 @@
const Cc = Components.classes;
const Ci = Components.interfaces;
const STSPATH = "/tests/security/ssl/stricttransportsecurity";
const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
const NUM_TEST_FRAMES = 4;
const CONTENT_PAGE =
"http://mochi.test:8888/chrome/security/ssl/stricttransportsecurity/page_blank.html";
"http://mochi.test:8888/chrome/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html";
// This is how many sub-tests (testframes) in each round.
// When the round begins, this will be initialized.

Просмотреть файл

@ -33,10 +33,10 @@ function uri(URIString) {
return ios.newURI(URIString, null, null);
}
var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TypedPage.htm");
var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/ClickedPage.htm");
var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TempRedirectPage.htm");
var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/PermRedirectPage.htm");
var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TypedPage.htm");
var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/ClickedPage.htm");
var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TempRedirectPage.htm");
var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/PermRedirectPage.htm");
// Stream Listener
function StreamListener(aChannel, aCallbackFunc) {

Просмотреть файл

@ -6,7 +6,7 @@
<head>
<title>Test for Bug 411966</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="bug_411966/redirect.js"></script>
<script type="text/javascript" src="mochitest/bug_411966/redirect.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>

Просмотреть файл

@ -60,7 +60,7 @@ function waitForTrue(fn, onWaitComplete) {
const kRed = "rgb(255, 0, 0)";
const kBlue = "rgb(0, 0, 255)";
var testpath = "/tests/toolkit/components/places/tests/mochitest/../bug_461710/";
var testpath = "/tests/toolkit/components/places/tests/mochitest/bug_461710/";
var prefix = "http://mochi.test:8888" + testpath;
var subtests = [
"visited_page.html", // 1
@ -163,7 +163,7 @@ var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/../bug_461710/iframe.html";
var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/bug_461710/iframe.html";
function testOnWindow(aIsPrivate, aCallback) {
var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});