| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>Service Worker: Registration</title> | 2 <title>Service Worker: Registration</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"></script> | 5 <script src="resources/test-helpers.js"></script> |
| 6 <script> | 6 <script> |
| 7 function fetch_url(url) { | 7 function fetch_url(url) { |
| 8 return new Promise(function(resolve, reject) { | 8 return new Promise(function(resolve, reject) { |
| 9 var request = new XMLHttpRequest(); | 9 var request = new XMLHttpRequest(); |
| 10 request.addEventListener('load', function(event) { | 10 request.addEventListener('load', function(event) { |
| 11 if (request.status == 200) | 11 if (request.status == 200) |
| 12 resolve(request.response); | 12 resolve(request.response); |
| 13 else | 13 else |
| 14 reject(Error(request.statusText)); | 14 reject(Error(request.statusText)); |
| 15 }); | 15 }); |
| 16 request.open('GET', url); | 16 request.open('GET', url); |
| 17 request.send(); | 17 request.send(); |
| 18 }); | 18 }); |
| 19 } | 19 } |
| 20 var worker = 'resources/fail-on-fetch-worker.js'; | 20 var worker = 'resources/fail-on-fetch-worker.js'; |
| 21 | 21 |
| 22 async_test(function(t) { | 22 async_test(function(t) { |
| 23 var scope = 'resources/scope/uncontrolled-page/'; | 23 var scope = 'resources/scope/uncontrolled-page/'; |
| 24 service_worker_unregister_and_register(t, worker, scope) | 24 service_worker_unregister_and_register(t, worker, scope) |
| 25 .then(function(reg) { return wait_for_activated(t, reg, scope); }) | 25 .then(function(reg) { |
| 26 return wait_for_state(t, reg.installing, 'activated'); |
| 27 }) |
| 26 .then(function() { | 28 .then(function() { |
| 27 return fetch_url('/serviceworker/resources/simple.json'); | 29 return fetch_url('/serviceworker/resources/simple.json'); |
| 28 }) | 30 }) |
| 29 .then(function(json) { | 31 .then(function(json) { |
| 30 assert_equals(json, '{ "a" : 1, "b" : 2 }\n'); | 32 assert_equals(json, '{ "a" : 1, "b" : 2 }\n'); |
| 31 service_worker_unregister_and_done(t, scope); | 33 service_worker_unregister_and_done(t, scope); |
| 32 }) | 34 }) |
| 33 .catch(t.step_func(function(reason) { | 35 .catch(t.step_func(function(reason) { |
| 34 assert_unreached(reason.message); | 36 assert_unreached(reason.message); |
| 35 })); | 37 })); |
| 36 }, 'Fetch events should not go through uncontrolled page.'); | 38 }, 'Fetch events should not go through uncontrolled page.'); |
| 37 </script> | 39 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 790683002:
ServiceWorker cleanup: remove wait_for_activated(); just use wait_for_state() (Closed)
Base URL: svn://svn.chromium.org/blink/trunk