diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-12 09:54:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 09:54:51 -0500 |
| commit | 0b2cc910d40aeed81d2de3296d371df4d0e81f60 (patch) | |
| tree | 7adf16c57df1c2802566442ae7e22c99b23dfabf | |
| parent | 7f4fe45639f7c4629e5ce99d932179dc3ee51257 (diff) | |
| parent | 07ea9e6332c1fc0e35b64a5168a03019ec82d816 (diff) | |
| download | servo-0b2cc910d40aeed81d2de3296d371df4d0e81f60.tar.gz servo-0b2cc910d40aeed81d2de3296d371df4d0e81f60.zip | |
Auto merge of #11666 - asajeffrey:cross-origin-parentage-test, r=ConnorGBrewster
Added tests for cross-origin iframe parentage.
<!-- Please describe your changes on the following line: -->
Added (currently failing) tests for cross-origin iframe 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] These changes fix #11478
- [X] There are tests for these changes
<!-- 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/11666)
<!-- Reviewable:end -->
5 files changed, 54 insertions, 0 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 069fe38d842..cf86aac2955 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -36052,6 +36052,12 @@ "url": "/html/semantics/embedded-content/the-iframe-element/change_parentage.html" } ], + "html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html": [ + { + "path": "html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html", + "url": "/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html" + } + ], "html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html": [ { "path": "html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html", diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html.ini new file mode 100644 index 00000000000..693f1ef185d --- /dev/null +++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html.ini @@ -0,0 +1,6 @@ +[cross_origin_parentage.html] + type: testharness + [Check the frame heriarchy 1] + expected: FAIL + [Check the frame heriarchy 2] + expected: FAIL diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html new file mode 100644 index 00000000000..8b44fe805fb --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html @@ -0,0 +1,12 @@ +<script src="iframe_harness.js"></script> +<body> + <iframe src="cross_origin_grandchild.html"></iframe> +</body> +<script> + send_test_results({ + "id": '79a52de8-4222-427e-92db-caec28e75f8e', + "parent": window.parent !== window, + "grandparent": window.parent.parent === window.parent, + "top": window.top === window.parent, + }); +</script> diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html new file mode 100644 index 00000000000..1eff64af105 --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html @@ -0,0 +1,11 @@ +<script src="iframe_harness.js"></script> +<body> +</body> +<script> + send_test_results({ + "id": '6c8da65d-2c5e-44ef-bb0b-b8b9849aab19', + "parent": window.parent !== window, + "grandparent": window.parent.parent !== window.parent, + "top": window.top === window.parent.parent, + }); +</script> diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html new file mode 100644 index 00000000000..cd27b8ea79c --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html @@ -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="http://www1.web-platform.test:8000/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html"></iframe> +</body> +<script> + get_test_results('bffa23ee-b45a-4e9a-9405-87ab437d5cfa'); + get_test_results('79a52de8-4222-427e-92db-caec28e75f8e'); + get_test_results('6c8da65d-2c5e-44ef-bb0b-b8b9849aab19'); + send_test_results({ + "id": 'bffa23ee-b45a-4e9a-9405-87ab437d5cfa', + "parent": window.parent === window, + "top": window.top === window, + }); +</script> |