Chromium Code Reviews Chromium Code Reviews
Issue 474193002:
Migrate some tests to use ServiceWorkerRegistration.unregister() (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| OLD | NEW |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> |
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> |
| 4 <script src="resources/test-helpers.js"></script> | 4 <script src="resources/test-helpers.js"></script> |
| 5 <script> | 5 <script> |
| 6 async_test(function(t) { | 6 async_test(function(t) { |
| 7 navigator.serviceWorker.unregister('http://example.com/') | 7 navigator.serviceWorker.unregister('http://example.com/') |
| 8 .then(function() { | 8 .then(function() { |
| 9 assert_unreached('unregistering out of origin should fail'); | 9 assert_unreached('unregistering out of origin should fail'); |
| 10 }, function(reason) { | 10 }, function(reason) { |
| 11 assert_equals(reason.name, 'SecurityError', | 11 assert_equals(reason.name, 'SecurityError', |
| 12 'unregistering out of origin scope should fail'); | 12 'unregistering out of origin scope should fail'); |
| 13 t.done(); | 13 t.done(); |
| 14 }) | 14 }) |
| 15 .catch(unreached_rejection(t)); | 15 .catch(unreached_rejection(t)); |
| 16 }, 'Unregistering out of origin'); | 16 }, 'Unregistering out of origin'); |
| 17 | 17 |
| 18 async_test(function(t) { | 18 async_test(function(t) { |
| 19 navigator.serviceWorker.unregister('/nothing-here/') | 19 var scope = 'scope/unregister-twice'; |
|
nhiroki
2014/08/15 09:53:40
These should be 4-indents?
https://sites.google.co
| |
| 20 var registration; | |
| 21 navigator.serviceWorker.register('resources/empty-worker.js', {scope: scope}) | |
| 22 .then(function(r) { | |
| 23 registration = r; | |
| 24 return registration.unregister(); | |
| 25 }) | |
| 26 .then(function() { | |
| 27 return registration.unregister(); | |
| 28 }) | |
| 20 .then(function(value) { | 29 .then(function(value) { |
| 21 assert_equals(value, undefined, | 30 assert_equals(value, undefined, |
| 22 'unregistering with no existing registration should ' + | 31 'unregistering twice should succeed with no value'); |
| 23 'succeed with no value'); | 32 t.done(); |
| 24 t.done(); | 33 }) |
| 25 }) | |
| 26 .catch(unreached_rejection(t)); | 34 .catch(unreached_rejection(t)); |
| 27 }, 'Unregistering with no existing registration'); | 35 }, 'Unregister twice'); |
| 28 | 36 |
| 29 async_test(function(t) { | 37 async_test(function(t) { |
| 30 var scope = '/register-then-unregister/'; | 38 var scope = 'scope/successful-unregister/'; |
| 31 navigator.serviceWorker.register( | 39 navigator.serviceWorker.register('resources/empty-worker.js', {scope: scope}) |
| 32 'resources/empty-worker.js', {scope: scope}) | 40 .then(function(registration) { |
| 33 .then(function(worker) { | 41 return registration.unregister(); |
| 34 return navigator.serviceWorker.unregister(scope); | 42 }) |
| 35 }) | |
| 36 .then(function(value) { | 43 .then(function(value) { |
| 37 assert_equals(value, undefined, | 44 assert_equals(value, undefined, |
| 38 'successful unregistration should succeed with no value'); | 45 'successful unregistration should succeed with no value'); |
| 39 t.done(); | 46 t.done(); |
| 40 }) | 47 }) |
| 41 .catch(unreached_rejection(t)); | 48 .catch(unreached_rejection(t)); |
| 42 }, 'Register then unregister'); | 49 }, 'Register then unregister'); |
| 43 | 50 |
| 44 async_test(function(t) { | 51 async_test(function(t) { |
| 45 var state_promise; | 52 var state_promise; |
| 46 service_worker_unregister_and_register(t, 'resources/empty-worker.js') | 53 service_worker_unregister_and_register(t, 'resources/empty-worker.js') |
| 47 .then(function(registration) { | 54 .then(function(registration) { |
| 48 return wait_for_update(t, registration); | 55 return wait_for_update(t, registration); |
| 49 }) | 56 }) |
| 50 .then(function(sw) { | 57 .then(function(sw) { |
| 51 state_promise = wait_for_state(t, sw, 'redundant'); | 58 state_promise = wait_for_state(t, sw, 'redundant'); |
| 52 return navigator.serviceWorker.unregister(); | 59 return navigator.serviceWorker.unregister(); |
| 53 }) | 60 }) |
| 54 .then(function(value) { | 61 .then(function(value) { |
| 55 assert_equals(value, undefined, | 62 assert_equals(value, undefined, |
| 56 'unregister with default scope should succeed'); | 63 'unregister with default scope should succeed'); |
| 57 return state_promise; | 64 return state_promise; |
| 58 }) | 65 }) |
| 59 .then(function(state) { | 66 .then(function(state) { |
| 60 assert_equals(state, 'redundant', | 67 assert_equals(state, 'redundant', |
| 61 'service worker registered with default scope should be ' + | 68 'service worker registered with default scope should be ' + |
| 62 'unregstered'); | 69 'unregstered'); |
| 63 t.done(); | 70 t.done(); |
| 64 }) | 71 }) |
| 65 .catch(unreached_rejection(t)); | 72 .catch(unreached_rejection(t)); |
| 66 }, 'Unregistering with default scope'); | 73 }, 'Unregistering with default scope'); |
| 67 | |
| 68 </script> | 74 </script> |
| OLD | NEW |
