| Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage-msgport-to-client.https.html
|
| diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage-msgport-to-client.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage-msgport-to-client.https.html
|
| index 38b4f56e784d0b33dbf6b0feed61b2dcd01003ff..29c056080c79d581975e0929dcebd84d63b86a20 100644
|
| --- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage-msgport-to-client.https.html
|
| +++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage-msgport-to-client.https.html
|
| @@ -1,51 +1,43 @@
|
| <!DOCTYPE html>
|
| -<title>Service Worker: postMessage to Client</title>
|
| +<title>Service Worker: postMessage via MessagePort to Client</title>
|
| <script src="/resources/testharness.js"></script>
|
| <script src="/resources/testharnessreport.js"></script>
|
| <script src="resources/test-helpers.sub.js"></script>
|
| <script>
|
| -var frame;
|
| -var t = async_test('postMessage MessagePorts from ServiceWorker to Client');
|
| -t.step(function() {
|
| - var scope = 'resources/blank.html'
|
| - service_worker_unregister_and_register(
|
| - t, 'resources/postmessage-msgport-to-client-worker.js', scope)
|
| - .then(function(registration) {
|
| +promise_test(t => {
|
| + var script = 'resources/postmessage-msgport-to-client-worker.js';
|
| + var scope = 'resources/blank.html';
|
| + var port;
|
| +
|
| + return service_worker_unregister_and_register(t, script, scope)
|
| + .then(registration => {
|
| + add_completion_callback(() => registration.unregister());
|
| return wait_for_state(t, registration.installing, 'activated');
|
| })
|
| - .then(function() { return with_iframe(scope); })
|
| - .then(function(f) {
|
| - frame = f;
|
| - var w = frame.contentWindow;
|
| - w.navigator.serviceWorker.onmessage = t.step_func(onMessage);
|
| - w.navigator.serviceWorker.controller.postMessage('ping');
|
| + .then(() => with_iframe(scope))
|
| + .then(frame => {
|
| + t.add_cleanup(() => frame.remove());
|
| + return new Promise(resolve => {
|
| + var w = frame.contentWindow;
|
| + w.navigator.serviceWorker.onmessage = resolve;
|
| + w.navigator.serviceWorker.controller.postMessage('ping');
|
| + });
|
| })
|
| - .catch(unreached_rejection(t));
|
| -
|
| - var result = [];
|
| - var expected = [
|
| - 'Acking value: 1',
|
| - 'Acking value: 2',
|
| - ];
|
| -
|
| - function onMessage(e) {
|
| - var message = e.data;
|
| - if ('port' in message) {
|
| - var port = message.port;
|
| - port.postMessage({value: 1});
|
| - port.postMessage({value: 2});
|
| - port.postMessage({done: true});
|
| - } else if ('ack' in message) {
|
| - result.push(message.ack);
|
| - } else if ('done' in message) {
|
| - assert_array_equals(
|
| - result, expected,
|
| - 'Worker should post back expected values via MessagePort.');
|
| - frame.remove();
|
| - service_worker_unregister_and_done(t, scope);
|
| - } else {
|
| - assert_unreached('Got unexpected message from ServiceWorker');
|
| - }
|
| - }
|
| - });
|
| + .then(e => {
|
| + port = e.ports[0];
|
| + port.postMessage({value: 1});
|
| + port.postMessage({value: 2});
|
| + port.postMessage({done: true});
|
| + return new Promise(resolve => { port.onmessage = resolve; });
|
| + })
|
| + .then(e => {
|
| + assert_equals(e.data.ack, 'Acking value: 1');
|
| + return new Promise(resolve => { port.onmessage = resolve; });
|
| + })
|
| + .then(e => {
|
| + assert_equals(e.data.ack, 'Acking value: 2');
|
| + return new Promise(resolve => { port.onmessage = resolve; });
|
| + })
|
| + .then(e => { assert_true(e.data.done, 'done'); });
|
| + }, 'postMessage MessagePorts from ServiceWorker to Client');
|
| </script>
|
|
|
Chromium Code Reviews
Issue 2875383002:
Upstream service worker `postMessage` tests to WPT (Closed)
