| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>ServiceWorker object: scriptURL property</title> | 2 <title>ServiceWorker object: scriptURL property</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 | 7 |
| 8 function url_test(name, url) { | 8 function url_test(name, url) { |
| 9 var scope = 'resources/scope/' + name; | 9 var scope = 'resources/scope/' + name; |
| 10 async_test(function(t) { | 10 async_test(function(t) { |
| 11 var expectedURL = normalizeURL(url); | 11 var expectedURL = normalizeURL(url); |
| 12 service_worker_unregister_and_register(t, url, scope) | 12 service_worker_unregister_and_register(t, url, scope) |
| 13 .then(function(registration) { | 13 .then(function(registration) { |
| 14 return wait_for_update(t, registration); | 14 var worker = registration.installing; |
| 15 assert_equals(worker.scriptURL, expectedURL, |
| 16 'Returned ServiceWorker object should have scriptURL'); |
| 17 service_worker_unregister_and_done(t, scope); |
| 15 }) | 18 }) |
| 16 .then(t.step_func(function(worker) { | |
| 17 assert_equals(worker.scriptURL, expectedURL, | |
| 18 'Returned ServiceWorker object should have scriptURL'); | |
| 19 service_worker_unregister_and_done(t, scope); | |
| 20 })) | |
| 21 .catch(unreached_rejection(t)); | 19 .catch(unreached_rejection(t)); |
| 22 }, 'Verify the scriptURL property: ' + name); | 20 }, 'Verify the scriptURL property: ' + name); |
| 23 } | 21 } |
| 24 | 22 |
| 25 url_test('relative', 'resources/empty-worker.js'); | 23 url_test('relative', 'resources/empty-worker.js'); |
| 26 url_test('with-fragment', 'resources/empty-worker.js#ref'); | 24 url_test('with-fragment', 'resources/empty-worker.js#ref'); |
| 27 url_test('absolute', | 25 url_test('absolute', |
| 28 'http://127.0.0.1:8000/serviceworker/resources/empty-worker.js'); | 26 'http://127.0.0.1:8000/serviceworker/resources/empty-worker.js'); |
| 29 | 27 |
| 30 </script> | 28 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 776373003:
ServiceWorker cleanup: remove wait_for_update() in favor of r.installing in most tests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk