Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 11:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1207556 - Part 2: Fix the beacon CORS preflight tests; r=sicking

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-09-24 16:45:26 -04:00
parent 63ed1d6a3e
commit 92615d28b8
4 changed files with 120 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dom/tests/mochitest/beacon/beacon-preflight-handler.sjs Normal file
View File

@ -0,0 +1,39 @@
function handleRequest(request, response)
{
response.setHeader("Cache-Control", "no-cache, must-revalidate", false);
if (request.queryString === "verify") {
var preflightState = getState("preflight");
response.write(preflightState === "done" ? "green" : "red");
return;
}
var originHeader = request.getHeader("origin");
response.setHeader("Access-Control-Allow-Headers", "content-type", false);
response.setHeader("Access-Control-Allow-Methods", "POST, GET", false);
response.setHeader("Access-Control-Allow-Origin", originHeader, false);
response.setHeader("Access-Control-Allow-Credentials", "true", false);
if (request.queryString === "beacon") {
if (request.method == "OPTIONS") {
setState("preflight", "done");
response.setStatusLine(null, 200, "OK");
return;
}
response.setStatusLine(null, 200, "OK");
response.write("DONE");
return;
}
if (request.queryString === "fail") {
if (request.method == "OPTIONS") {
setState("preflight", "done");
response.setStatusLine(null, 400, "Bad Request");
return;
}
setState("preflight", "oops");
response.setStatusLine(null, 200, "OK");
response.write("DONE");
return;
}
}

2
dom/tests/mochitest/beacon/mochitest.ini
View File

@ -2,12 +2,14 @@
skip-if = buildapp == 'b2g'
support-files = beacon-frame.html
beacon-handler.sjs
beacon-preflight-handler.sjs
beacon-originheader-handler.sjs
beacon-cors-redirect-handler.sjs
[test_beacon.html]
[test_beaconFrame.html]
[test_beaconPreflight.html]
[test_beaconPreflightFailure.html]
[test_beaconContentPolicy.html]
[test_beaconOriginHeader.html]
[test_beaconCORSRedirect.html]

26
dom/tests/mochitest/beacon/test_beaconPreflight.html
View File

@ -17,7 +17,24 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=936340
<pre id="test">
<script class="testbody" type="text/javascript">
var beaconUrl = "http://mochi.test:8888/tests/dom/tests/mochitest/beacon/beacon-handler.sjs";
var beaconUrl = "http://example.com/tests/dom/tests/mochitest/beacon/beacon-preflight-handler.sjs?beacon";
var intervalID = null;
function queryIfBeaconSucceeded() {
clearInterval(intervalID);
var xhr = new XMLHttpRequest();
xhr.open("GET", "beacon-preflight-handler.sjs?verify", true);
xhr.onload = function() {
is(xhr.responseText, "green", "SendBeacon should have succeeded after preflight!");
SimpleTest.finish();
};
xhr.onerror = function() {
ok(false, "xhr request returned error");
SimpleTest.finish();
};
xhr.send();
}
// not enabled by default yet.
SimpleTest.waitForExplicitFinish();
@ -26,8 +43,11 @@ SpecialPowers.pushPrefEnv({'set': [["beacon.enabled", true]]}, beginTest);
function beginTest() {
var abv = new Uint8Array([0,1,2,3]);
var sent = navigator.sendBeacon(beaconUrl, abv);
ok(sent, "non-standard content type allowed after pre-flight");
SimpleTest.finish();
ok(sent, "sending the beacon should start successfully");
// we have to make sure sending the beacon did not fail, so
// we have to wait for 2 seconds before we can query the result.
intervalID = setInterval(queryIfBeaconSucceeded, 2000);
}
</script>

56
dom/tests/mochitest/beacon/test_beaconPreflightFailure.html Normal file
View File

@ -0,0 +1,56 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1207556
-->
<head>
<title>Test for Bug 1207556</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1207556">Mozilla Bug 1207556</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
var beaconUrl = "http://example.com/tests/dom/tests/mochitest/beacon/beacon-preflight-handler.sjs?fail";
var intervalID = null;
function queryIfBeaconSucceeded() {
clearInterval(intervalID);
var xhr = new XMLHttpRequest();
xhr.open("GET", "beacon-preflight-handler.sjs?verify", true);
xhr.onload = function() {
is(xhr.responseText, "red", "SendBeacon should have failed because of a failed preflight!");
SimpleTest.finish();
};
xhr.onerror = function() {
ok(false, "xhr request returned error");
SimpleTest.finish();
};
xhr.send();
}
// not enabled by default yet.
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({'set': [["beacon.enabled", true]]}, beginTest);
function beginTest() {
var abv = new Uint8Array([0,1,2,3]);
var sent = navigator.sendBeacon(beaconUrl, abv);
ok(sent, "sending the beacon should start successfully");
// we have to make sure sending the beacon did not fail, so
// we have to wait for 2 seconds before we can query the result.
intervalID = setInterval(queryIfBeaconSucceeded, 2000);
}
</script>
</pre>
</body>
</html>