| author | Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com> |
| Mon, 11 Sep 2017 13:14:57 +0200 | |
| changeset 380085 | 2c284ff4354aa075579a85d4dd13ca1bf7d41f86 |
| parent 380084 | ab8c75e0d4220a3218c79e963a3ffc455ba05419 |
| child 380086 | d5a9ae0983b8f2111b131bdf2480ea77ceb264e7 |
| push id | 32477 |
| push user | kwierso@gmail.com |
| push date | Mon, 11 Sep 2017 21:41:58 +0000 |
| treeherder | mozilla-central@85157b4b361a [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | jgraham, valentin |
| bugs | 1398574 |
| milestone | 57.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -316669,21 +316669,31 @@ {} ] ], "websockets/unload-a-document/001-1.html": [ [ {} ] ], + "websockets/unload-a-document/001-2.html": [ + [ + {} + ] + ], "websockets/unload-a-document/002-1.html": [ [ {} ] ], + "websockets/unload-a-document/002-2.html": [ + [ + {} + ] + ], "websockets/unload-a-document/005-1.html": [ [ {} ] ], "websockets/websocket.sub.js": [ [ {} @@ -639541,29 +639551,37 @@ "51e56fc8ceac3be2107872900c1930b1f5bd60da", "testharness" ], "websockets/security/check.py": [ "cc1a6f0c2659e3ca18a7dd487bde3eb4fe0d15b2", "support" ], "websockets/unload-a-document/001-1.html": [ - "5388c58ec7f586a8c79da8955ea25ff0350a08ff", + "89f76dff719f15fce07b674aa4bcc971610da686", + "support" + ], + "websockets/unload-a-document/001-2.html": [ + "facbeee79f931d0ba88163abac18b38bff94f260", "support" ], "websockets/unload-a-document/001.html": [ - "bcfd6cdc6b9dc497c3828fe0a77f1db3676be495", + "f78f6bc059375d19b8ac2619fba93b12e5506132", "testharness" ], "websockets/unload-a-document/002-1.html": [ - "284ca768f294b0716ada9f2936f3862e075388c2", + "353ee429f9d6e90d86f0de251f7ad86f436ad4e2", + "support" + ], + "websockets/unload-a-document/002-2.html": [ + "e689149429d1e29775d7c7f6f5ad6afdde0a1b39", "support" ], "websockets/unload-a-document/002.html": [ - "f39414dbf15f502f6be82324bbf389e75532cb6b", + "aaf934be13d0c9df63a1ff5da6d90cb290855b11", "testharness" ], "websockets/unload-a-document/003.html": [ "3d1861da30072c3e73f9f1e656f836b8cec7c150", "testharness" ], "websockets/unload-a-document/004.html": [ "a70ee20ff039315f7bcfd1ece1b54705d3479b5c",
--- a/testing/web-platform/tests/websockets/unload-a-document/001-1.html +++ b/testing/web-platform/tests/websockets/unload-a-document/001-1.html @@ -17,12 +17,12 @@ t.step(function() { sessionStorage[uuid] = 'true'; var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); ws.onopen = t.step_func(function(e) { t.step_timeout(function() { assert_unreached('document was not discarded'); }, 1000); controller.navigate(); }) - ws.onerror = ws.onmessage = ws.onclose = t.step_func(e => assert_unreached("Got unexpected event " + e.type)); + ws.onerror = ws.onmessage = t.step_func(e => assert_unreached("Got unexpected event " + e.type)); } }); </script>
new file mode 100644 --- /dev/null +++ b/testing/web-platform/tests/websockets/unload-a-document/001-2.html @@ -0,0 +1,4 @@ +<!doctype html> +<title>WebSockets: navigating top-level browsing context</title> +<body onload="history.back()"></body> +</html>
--- a/testing/web-platform/tests/websockets/unload-a-document/001.html +++ b/testing/web-platform/tests/websockets/unload-a-document/001.html @@ -15,11 +15,11 @@ var uuid; t.step(function() { uuid = token() w = window.open("001-1.html"); add_result_callback(function() { w.close(); }); }); navigate = t.step_func(function() { - w.location = 'data:text/html,<body onload="history.back()">'; + w.location = w.location.href.replace("001-1.html", "001-2.html"); }); </script>
--- a/testing/web-platform/tests/websockets/unload-a-document/002-1.html +++ b/testing/web-platform/tests/websockets/unload-a-document/002-1.html @@ -23,12 +23,12 @@ t.step(function() { assert_equals(ws.readyState, ws.CLOSED, 'ws.readyState'); t.done(); }, 4000); ws.close(); ws.onclose = t.step_func(function() { controller.navigate(); }); }) - ws.onerror = ws.onmessage = ws.onclose = t.step_func(e => assert_unreached("Got unexpected event " + e.type)); + ws.onerror = ws.onmessage = t.step_func(e => assert_unreached("Got unexpected event " + e.type)); } }); </script>
new file mode 100644 --- /dev/null +++ b/testing/web-platform/tests/websockets/unload-a-document/002-2.html @@ -0,0 +1,4 @@ +<!doctype html> +<title>WebSockets: navigating top-level browsing context with closed websocket</title> +<body onload="history.back()"></body> +</html>
--- a/testing/web-platform/tests/websockets/unload-a-document/002.html +++ b/testing/web-platform/tests/websockets/unload-a-document/002.html @@ -16,11 +16,11 @@ var uuid; t.step(function() { uuid = token() w = window.open("002-1.html"); add_result_callback(function() { w.close(); }); }); navigate = t.step_func(function() { - w.location = 'data:text/html,<body onload="history.back()">'; + w.location = w.location.href.replace("002-1.html", "002-2.html"); }); </script>