third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-document-close.html - Issue 1907443007: Use promises in notifications tests and enable controlling the page.

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-document-close.html

Issue 1907443007: Use promises in notifications tests and enable controlling the page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Address peter's comments. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-document-click.html ('k') | third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-document-data-invalid.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!doctype html>	1 <!doctype html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>Notifications: ServiceWorkerRegistration.showNotification().</title>	4 <title>Notifications: ServiceWorkerRegistration.showNotification().</title>

5 <script src="../resources/testharness.js"></script>	5 <script src="../resources/testharness.js"></script>

6 <script src="../resources/testharnessreport.js"></script>	6 <script src="../resources/testharnessreport.js"></script>

7 <script src="../serviceworker/resources/test-helpers.js"></script>	7 <script src="../serviceworker/resources/test-helpers.js"></script>

8 <script src="resources/test-helpers.js"></script>	8 <script src="resources/test-helpers.js"></script>

9 </head>	9 </head>

10 <body>	10 <body>

11 <script>	11 <script>

12 // Tests that the showNotification() function resolves a promise, that the	12 // Tests that the showNotification() function resolves a promise, that the

13 // notificationclick event gets fired on the Service Worker when we simula te a	13 // notificationclick event gets fired on the Service Worker when we simula te a

14 // click on it, and the notification can then be closed. This test require s	14 // click on it, and the notification can then be closed. This test require s

15 // the test runner.	15 // the test runner.

16 async_test(function(test) {	16 async_test(function(test) {

17 var scope = 'resources/scope/serviceworkerregistration-document-close' ,	17 var scope = 'resources/scope/serviceworkerregistration-document-close' ;

18 script = 'resources/instrumentation-service-worker.js';	18 var script = 'instrumentation-service-worker.js';

	19 var port;

19	20

20 testRunner.setPermission('notifications', 'granted', location.origin, location.origin);	21 testRunner.setPermission('notifications', 'granted', location.origin, location.origin);

21	22

22 var workerInfo = null;

23 getActiveServiceWorkerWithMessagePort(test, script, scope).then(functi on(info) {	23 getActiveServiceWorkerWithMessagePort(test, script, scope).then(functi on(info) {

24 workerInfo = info;	24 port = info.port;

25	25

26 // (1) Display a Web Notification from the document.	26 // (1) Show a notification from the document. It will be closed by the service worker.

27 assert_inherits(workerInfo.registration, 'showNotification', 'show Notification() must be exposed.');	27 assert_inherits(info.registration, 'showNotification', 'showNotifi cation() must be exposed.');

28 return workerInfo.registration.showNotification(scope, {	28 return info.registration.showNotification(scope, {

29 body: 'ACTION:CLOSE',	29 body: 'ACTION:CLOSE',

30 icon: '/icon.png'	30 icon: '/icon.png'

31 });	31 });

32 }).then(function() {	32 }).then(function() {

33 // (2) Simulate a click on the notification that has been displaye d.	33 // (2) Simulate a click on the notification that has been displaye d.

34 testRunner.simulateWebNotificationClick(scope, -1 /* action_index */);	34 return simulateNotificationClick(scope, -1 /* action_index */, por t);

	35 }).then(function(data) {

	36 // (3) Verify that the correct notification was closed.

	37 assert_equals(event.data.notification.title, scope);

	38 return sendCommand(port, { command: 'get' });

	39 }).then(function(data) {

	40 // (4) Verify there are no more open notifications.

	41 assert_equals(data.notifications.length, 0);

35	42

36 workerInfo.port.addEventListener('message', function(event) {	43 test.done();

37 if (typeof event.data != 'object' \|\| !event.data.command) {

38 assert_unreached('Received an invalid message from the Ser vice Worker.');

39 return;

40 }

41

42 // (3) Verify that the click event was received by the Service Worker.

43 assert_equals(event.data.command, 'click');

44 assert_equals(event.data.notification.title, scope);

45

46 // FIXME: The notification has now been closed by the Service Worker. In

47 // order to verify that this works correctly, we need to suppo rt the

48 // Notification.get() getter, which is not implemented yet.

49

50 test.done();

51 });

52 }).catch(unreached_rejection(test));	44 }).catch(unreached_rejection(test));

53	45

54 }, 'Clicking on a notification displayed through showNotification() fires a Service Worker event, and can be closed there.');	46 }, 'Clicking on a notification displayed through showNotification() fires a Service Worker event, and can be closed there.');

55 </script>	47 </script>

56 </body>	48 </body>

57 </html>	49 </html>

OLD	NEW