Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11476 - asajeffrey:add-tests-for-iframe-parentage, r=jdm

Browse source 
Added wpt tests for same-origin iframe parentage.

<!-- Please describe your changes on the following line: -->
Added some wpt tests to make sure same-origin iframes have the right parentage.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11476)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-02 14:30:01 -05:00
commit a99cd2362d
6 changed files with 84 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -6454,6 +6454,12 @@
"url": "/_mozilla/mozilla/iframe-unblock-onload.html"
}
],
"mozilla/iframe/same_origin_parentage.html": [
{
"path": "mozilla/iframe/same_origin_parentage.html",
"url": "/_mozilla/mozilla/iframe/same_origin_parentage.html"
}
],
"mozilla/iframe_contentDocument.html": [
{
"path": "mozilla/iframe_contentDocument.html",

26
tests/wpt/mozilla/tests/mozilla/iframe/iframe_harness.js Normal file
View file

@ -0,0 +1,26 @@
function get_test_results(id) {
async_test(function(test) {
var timer = window.setInterval(test.step_func(loop), 100);
function loop() {
var xhr = new XMLHttpRequest();
xhr.open('GET', 'stash.py?id=' + id);
xhr.onreadystatechange = test.step_func(function() {
assert_equals(xhr.status, 200);
if (xhr.responseText) {
assert_equals(xhr.responseText, "OK");
test.done();
window.clearTimeout(timer);
}
});
xhr.send();
}
});
}
function send_test_results(results) {
var ok = true;
for (result in results) { ok = ok && results[result]; }
var xhr = new XMLHttpRequest();
xhr.open('POST', 'stash.py?id=' + results.id);
xhr.send(ok ? "OK" : "FAIL: " + JSON.stringify(results));
}

12
tests/wpt/mozilla/tests/mozilla/iframe/same_origin_child.html Normal file
View file

@ -0,0 +1,12 @@
<script src="iframe_harness.js"></script>
<body>
<iframe src="same_origin_grandchild.html"></iframe>
</body>
<script>
send_test_results({
"id": '08782f28-e313-47ae-8cd7-419f3e194b0a',
"parent": window.parent !== window,
"grandparent": window.parent.parent === window.parent,
"top": window.top === window.parent,
});
</script>

11
tests/wpt/mozilla/tests/mozilla/iframe/same_origin_grandchild.html Normal file
View file

@ -0,0 +1,11 @@
<script src="iframe_harness.js"></script>
<body>
</body>
<script>
send_test_results({
"id": '66de8d44-7da7-47c7-9a52-41cba4f22bfe',
"parent": window.parent !== window,
"grandparent": window.parent.parent !== window.parent,
"top": window.top === window.parent.parent,
});
</script>

19
tests/wpt/mozilla/tests/mozilla/iframe/same_origin_parentage.html Normal file
View file

@ -0,0 +1,19 @@
<!doctype html>
<meta charset="utf-8">
<title>Check the frame heriarchy</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="iframe_harness.js"></script>
<body>
<iframe src="same_origin_child.html"></iframe>
</body>
<script>
get_test_results('17381dae-9c3e-4661-9f2b-28eb07a5f2fc');
get_test_results('08782f28-e313-47ae-8cd7-419f3e194b0a');
get_test_results('66de8d44-7da7-47c7-9a52-41cba4f22bfe');
send_test_results({
"id": '17381dae-9c3e-4661-9f2b-28eb07a5f2fc',
"parent": window.parent === window,
"top": window.top === window,
});
</script>

10
tests/wpt/mozilla/tests/mozilla/iframe/stash.py Normal file
View file

@ -0,0 +1,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
def main(request, response):
if request.method == 'POST':
request.server.stash.put(request.GET["id"], request.body)
return ''
return request.server.stash.take(request.GET["id"])