OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <title>Service Worker: CSP control of fetch()</title> | 2 <title>Service Worker: CSP control of fetch()</title> |
3 <script src="../resources/testharness.js"></script> | 3 <script src="../resources/testharness.js"></script> |
4 <script src="../resources/testharnessreport.js"></script> | 4 <script src="../resources/testharnessreport.js"></script> |
5 <script src="resources/test-helpers.js?pipe=sub"></script> | 5 <script src="resources/test-helpers.js?pipe=sub"></script> |
6 <script> | 6 <script> |
7 async_test(function(t) { | 7 async_test(function(t) { |
8 var SCOPE = 'resources/fetch-csp-iframe.html'; | 8 var SCOPE = 'resources/fetch-csp-iframe.html'; |
9 var SCRIPT = 'resources/fetch-rewrite-worker.js'; | 9 var SCRIPT = 'resources/fetch-rewrite-worker.js'; |
10 var host_info = get_host_info(); | 10 var host_info = get_host_info(); |
11 service_worker_unregister_and_register(t, SCRIPT, SCOPE) | 11 service_worker_unregister_and_register(t, SCRIPT, SCOPE) |
| 12 .then(function(registration) { |
| 13 return wait_for_update(t, registration); |
| 14 }) |
12 .then(function(sw) { | 15 .then(function(sw) { |
13 return wait_for_state(t, sw, 'activated'); | 16 return wait_for_state(t, sw, 'activated'); |
14 }) | 17 }) |
15 .then(function() { return with_iframe(SCOPE); }) | 18 .then(function() { return with_iframe(SCOPE); }) |
16 .then(function(frame) { | 19 .then(function(frame) { |
17 return new Promise(function(resolve, reject) { | 20 return new Promise(function(resolve, reject) { |
18 var channel = new MessageChannel(); | 21 var channel = new MessageChannel(); |
19 channel.port1.onmessage = t.step_func(function(e) { | 22 channel.port1.onmessage = t.step_func(function(e) { |
20 assert_equals(e.data.results, 'finish'); | 23 assert_equals(e.data.results, 'finish'); |
21 service_worker_unregister_and_done(t, SCOPE); | 24 service_worker_unregister_and_done(t, SCOPE); |
22 }); | 25 }); |
23 frame.contentWindow.postMessage({}, | 26 frame.contentWindow.postMessage({}, |
24 [channel.port2], | 27 [channel.port2], |
25 host_info['HTTP_ORIGIN']); | 28 host_info['HTTP_ORIGIN']); |
26 }); | 29 }); |
27 }) | 30 }) |
28 .catch(unreached_rejection(t)); | 31 .catch(unreached_rejection(t)); |
29 }, 'Verify CSP control of fetch() in a Service Worker'); | 32 }, 'Verify CSP control of fetch() in a Service Worker'); |
30 </script> | 33 </script> |
OLD | NEW |