Chromium Code Reviews Chromium Code Reviews
Issue 1332303002:
Make registration.update() no longer force bypassing the HTTP cache (1/2) (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>ServiceWorkerGlobalScope: update</title> | 2 <title>ServiceWorkerGlobalScope: update</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 promise_test(function(t) { | 8 promise_test(function(t) { |
| 9 var script = 'resources/update-worker.php'; | 9 var script = 'resources/update-worker.php'; |
| 10 var scope = 'resources/scope/update'; | 10 var scope = 'resources/scope/update'; |
| 11 var registration; | 11 var registration; |
| 12 var frame1; | 12 var frame1, frame2; |
| 13 | |
| 14 function update_resolved(test, container) { | |
| 15 return new Promise(test.step_func(function(resolve) { | |
| 16 container.addEventListener('message', test.step_func(function(e) { | |
| 17 if (e.data == 'update resolved') | |
| 18 resolve(); | |
| 19 })); | |
| 20 })); | |
| 21 } | |
| 13 | 22 |
| 14 return service_worker_unregister_and_register(t, script, scope) | 23 return service_worker_unregister_and_register(t, script, scope) |
| 15 .then(function(r) { | 24 .then(function(r) { |
| 16 registration = r; | 25 registration = r; |
| 17 return wait_for_state(t, registration.installing, 'activated'); | 26 return wait_for_state(t, registration.installing, 'activated'); |
| 18 }) | 27 }) |
| 19 .then(function() { return with_iframe(scope); }) | 28 .then(function() { return with_iframe(scope); }) |
| 20 .then(function(f) { | 29 .then(function(f) { |
| 21 frame1 = f; | 30 frame1 = f; |
| 22 registration.active.postMessage('update'); | 31 var expected_events_seen = [ |
| 23 return wait_for_update(t, registration); | 32 'updatefound', // by register(). |
| 33 'activate', | |
| 34 'fetch' | |
| 35 ]; | |
| 36 assert_equals( | |
| 37 f.contentDocument.body.textContent, | |
| 38 expected_events_seen.toString(), | |
| 39 'events seen by the worker for register()'); | |
|
falken
2015/10/01 14:58:04
This assert looks unneeded for this test, which is
| |
| 40 registration.active.postMessage(f.contentWindow.location.href); | |
| 41 return update_resolved(t, f.contentWindow.navigator.serviceWorker); | |
| 24 }) | 42 }) |
| 25 .then(function() { return with_iframe(scope); }) | 43 .then(function() { return with_iframe(scope); }) |
| 26 .then(function(frame2) { | 44 .then(function(f) { |
| 45 frame2 = f; | |
| 27 var expected_events_seen = [ | 46 var expected_events_seen = [ |
| 28 'updatefound', // by register(). | |
| 29 'activate', | |
| 30 'fetch', | |
| 31 'message', | 47 'message', |
| 32 'updatefound', // by update() in the message handler. | 48 'new-version', // by update() in the message handler. |
| 33 'fetch', | 49 'updatefound', // new version was found and updatefound fired. |
| 50 'fetch' | |
| 34 ]; | 51 ]; |
| 35 assert_equals( | 52 assert_equals( |
| 36 frame2.contentDocument.body.textContent, | 53 f.contentDocument.body.textContent, |
| 37 expected_events_seen.toString(), | 54 expected_events_seen.toString(), |
| 38 'events seen by the worker'); | 55 'events seen by the worker for update() with a new version'); |
| 56 registration.active.postMessage(f.contentWindow.location.href); | |
| 57 return update_resolved(t, f.contentWindow.navigator.serviceWorker); | |
| 58 }) | |
| 59 .then(function() { return with_iframe(scope); }) | |
| 60 .then(function(frame3) { | |
| 61 var expected_events_seen = [ | |
| 62 'message', | |
| 63 'cached-version', // by update() in the message handler. | |
| 64 'fetch' // version was served from cache so no updatefound | |
| 65 ]; // fired. | |
| 66 assert_equals( | |
| 67 frame3.contentDocument.body.textContent, | |
| 68 expected_events_seen.toString(), | |
| 69 'events seen by the worker for update() with a cached version'); | |
| 39 frame1.remove(); | 70 frame1.remove(); |
| 40 frame2.remove(); | 71 frame2.remove(); |
| 72 frame3.remove(); | |
| 41 return service_worker_unregister_and_done(t, scope); | 73 return service_worker_unregister_and_done(t, scope); |
| 42 }); | 74 }); |
| 43 }, 'Update a registration on ServiceWorkerGlobalScope'); | 75 }, 'Update a registration on ServiceWorkerGlobalScope'); |
| 44 | 76 |
| 45 </script> | 77 </script> |
| OLD | NEW |
