| 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'; |
| 20 .then(function(value) { | 20 var registration; |
| 21 assert_equals(value, undefined, | 21 navigator.serviceWorker.register('resources/empty-worker.js', |
| 22 'unregistering with no existing registration should ' + | 22 {scope: scope}) |
| 23 'succeed with no value'); | 23 .then(function(r) { |
| 24 t.done(); | 24 registration = r; |
| 25 }) | 25 return registration.unregister(); |
| 26 .catch(unreached_rejection(t)); | 26 }) |
| 27 }, 'Unregistering with no existing registration'); | 27 .then(function() { |
| 28 return registration.unregister(); |
| 29 }) |
| 30 .then(function(value) { |
| 31 assert_equals(value, undefined, |
| 32 'unregistering twice should succeed with no value'); |
| 33 t.done(); |
| 34 }) |
| 35 .catch(unreached_rejection(t)); |
| 36 }, 'Unregister twice'); |
| 28 | 37 |
| 29 async_test(function(t) { | 38 async_test(function(t) { |
| 30 var scope = '/register-then-unregister/'; | 39 var scope = 'scope/successful-unregister/'; |
| 31 navigator.serviceWorker.register( | 40 navigator.serviceWorker.register('resources/empty-worker.js', {scope: scope}
) |
| 32 'resources/empty-worker.js', {scope: scope}) | 41 .then(function(registration) { |
| 33 .then(function(worker) { | 42 return registration.unregister(); |
| 34 return navigator.serviceWorker.unregister(scope); | 43 }) |
| 35 }) | 44 .then(function(value) { |
| 36 .then(function(value) { | 45 assert_equals(value, undefined, |
| 37 assert_equals(value, undefined, | 46 'successful unregistration should succeed with no value'
); |
| 38 'successful unregistration should succeed with no value'); | 47 t.done(); |
| 39 t.done(); | 48 }) |
| 40 }) | 49 .catch(unreached_rejection(t)); |
| 41 .catch(unreached_rejection(t)); | 50 }, 'Register then unregister'); |
| 42 }, 'Register then unregister'); | |
| 43 | 51 |
| 44 async_test(function(t) { | 52 async_test(function(t) { |
| 45 var state_promise; | 53 var state_promise; |
| 46 service_worker_unregister_and_register(t, 'resources/empty-worker.js') | 54 service_worker_unregister_and_register(t, 'resources/empty-worker.js') |
| 47 .then(function(registration) { | 55 .then(function(registration) { |
| 48 return wait_for_update(t, registration); | 56 return wait_for_update(t, registration); |
| 49 }) | 57 }) |
| 50 .then(function(sw) { | 58 .then(function(sw) { |
| 51 state_promise = wait_for_state(t, sw, 'redundant'); | 59 state_promise = wait_for_state(t, sw, 'redundant'); |
| 52 return navigator.serviceWorker.unregister(); | 60 return navigator.serviceWorker.unregister(); |
| 53 }) | 61 }) |
| 54 .then(function(value) { | 62 .then(function(value) { |
| 55 assert_equals(value, undefined, | 63 assert_equals(value, undefined, |
| 56 'unregister with default scope should succeed'); | 64 'unregister with default scope should succeed'); |
| 57 return state_promise; | 65 return state_promise; |
| 58 }) | 66 }) |
| 59 .then(function(state) { | 67 .then(function(state) { |
| 60 assert_equals(state, 'redundant', | 68 assert_equals(state, 'redundant', |
| 61 'service worker registered with default scope should be ' + | 69 'service worker registered with default scope ' + |
| 62 'unregstered'); | 70 'should be unregistered'); |
| 63 t.done(); | 71 t.done(); |
| 64 }) | 72 }) |
| 65 .catch(unreached_rejection(t)); | 73 .catch(unreached_rejection(t)); |
| 66 }, 'Unregistering with default scope'); | 74 }, 'Unregistering with default scope'); |
| 67 | |
| 68 </script> | 75 </script> |
| OLD | NEW |