| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <title>register() succeeds when permission is granted and resolves with a valid
registration</title> | 4 <title>subscribe() succeeds when permission is granted and resolves with a valid
subscription</title> |
| 5 <link rel="manifest" href="resources/push_manifest.json"> | 5 <link rel="manifest" href="resources/push_manifest.json"> |
| 6 <script src="../resources/testharness.js"></script> | 6 <script src="../resources/testharness.js"></script> |
| 7 <script src="../resources/testharnessreport.js"></script> | 7 <script src="../resources/testharnessreport.js"></script> |
| 8 <script src="../serviceworker/resources/test-helpers.js"></script> | 8 <script src="../serviceworker/resources/test-helpers.js"></script> |
| 9 </head> | 9 </head> |
| 10 <body> | 10 <body> |
| 11 <script> | 11 <script> |
| 12 async_test(function(test) { | 12 async_test(function(test) { |
| 13 var workerUrl = 'resources/empty_worker.js'; | 13 var workerUrl = 'resources/empty_worker.js'; |
| 14 var workerScope = 'resources/scope/' + location.pathname; | 14 var workerScope = 'resources/scope/' + location.pathname; |
| 15 var swRegistration; | 15 var swRegistration; |
| 16 service_worker_unregister_and_register(test, workerUrl, workerScope) | 16 service_worker_unregister_and_register(test, workerUrl, workerScope) |
| 17 .then(function(serviceWorkerRegistration) { | 17 .then(function(serviceWorkerRegistration) { |
| 18 swRegistration = serviceWorkerRegistration; | 18 swRegistration = serviceWorkerRegistration; |
| 19 return wait_for_state(test, swRegistration.installing, 'activated'); | 19 return wait_for_state(test, swRegistration.installing, 'activated'); |
| 20 }) | 20 }) |
| 21 .then(function() { | 21 .then(function() { |
| 22 // If running manually, grant permission when prompted. | 22 // If running manually, grant permission when prompted. |
| 23 if (self.testRunner) | 23 if (self.testRunner) |
| 24 testRunner.setPushMessagingPermission(location.origin, true); | 24 testRunner.setPushMessagingPermission(location.origin, true); |
| 25 return swRegistration.pushManager.register(); | 25 return swRegistration.pushManager.subscribe(); |
| 26 }) | 26 }) |
| 27 .then(function(pushRegistration) { | 27 .then(function(pushSubscription) { |
| 28 assert_own_property(pushRegistration, 'registrationId'); | 28 assert_own_property(pushSubscription, 'subscriptionId'); |
| 29 assert_equals(typeof pushRegistration.registrationId, 'string'); | 29 assert_equals(typeof pushSubscription.subscriptionId, 'string'); |
| 30 | 30 |
| 31 assert_own_property(pushRegistration, 'endpoint'); | 31 assert_own_property(pushSubscription, 'endpoint'); |
| 32 assert_equals(typeof pushRegistration.endpoint, 'string'); | 32 assert_equals(typeof pushSubscription.endpoint, 'string'); |
| 33 try { | 33 try { |
| 34 var endpointUrl = new URL(pushRegistration.endpoint); | 34 var endpointUrl = new URL(pushSubscription.endpoint); |
| 35 } catch(e) { | 35 } catch(e) { |
| 36 assert_unreached('Constructing a URL from the endpoint should not
throw.'); | 36 assert_unreached('Constructing a URL from the endpoint should not
throw.'); |
| 37 } | 37 } |
| 38 | 38 |
| 39 return service_worker_unregister_and_done(test, workerScope); | 39 return service_worker_unregister_and_done(test, workerScope); |
| 40 }) | 40 }) |
| 41 .catch(unreached_rejection(test)); | 41 .catch(unreached_rejection(test)); |
| 42 }, 'register() succeeds when permission is granted and resolves with a valid reg
istration'); | 42 }, 'subscribe() succeeds when permission is granted and resolves with a valid su
bscription'); |
| 43 </script> | 43 </script> |
| 44 </body> | 44 </body> |
| 45 </html> | 45 </html> |
| OLD | NEW |