third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-service-worker-get.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-service-worker-get.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-service-worker-click.html ('k') | third_party/WebKit/LayoutTests/http/tests/notifications/serviceworkerregistration-service-worker-get-filter.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.getNotifications() within a Service Worker.</title>	4 <title>Notifications: ServiceWorkerRegistration.getNotifications() within a Service Worker.</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 getNotifications() function when used in a Service Worke r	12 // Tests that the getNotifications() function when used in a Service Worke r

13 // return an array of the notifications which were previously displayed us ing	13 // return an array of the notifications which were previously displayed us ing

14 // the same Service Worker registration id.	14 // the same Service Worker registration id.

15 async_test(function(test) {	15 async_test(function(test) {

16 var scope = 'resources/scope/' + location.pathname,	16 var scope = 'resources/scope/' + location.pathname,

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

18	18

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

20	20

21 var info = null;	21 var info = null;

22 getActiveServiceWorkerWithMessagePort(test, script, scope).then(functi on(workerInfo) {	22 getActiveServiceWorkerWithMessagePort(test, script, scope).then(functi on(workerInfo) {

23 info = workerInfo;	23 info = workerInfo;

24	24

25 // (1) Display two notifications in the Document.	25 // (1) Display two notifications in the Document.

26 return info.registration.showNotification('Hello, world!', {	26 return info.registration.showNotification('Hello, world!', {

27 body: 'First notification'	27 body: 'First notification'

28 });	28 });

29 }).then(function() {	29 }).then(function() {

30 return info.registration.showNotification('Hello again, world!', {	30 return info.registration.showNotification('Hello again, world!', {

31 body: 'Second notification'	31 body: 'Second notification'

32 });	32 });

33 }).then(function() {	33 }).then(function() {

34 // (2) Request the Service Worker to give us all notifications.	34 // (2) Request the Service Worker to give us all notifications.

35 info.port.postMessage({	35 return sendCommand(info.port, { command: 'get' });

36 command: 'get'	36 }).then(function(data) {

37 });	37 // (3) Confirm that the Service Worker was able to read both of th em.

	38 assert_true(data.success);

38	39

39 info.port.addEventListener('message', function(event) {	40 var notifications = data.notifications;

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

41 assert_unreached('Invalid message from the Service Worker. ');

42 return;

43 }

44	41

45 // (3) Confirm that the Service Worker was able to read both o f them.	42 assert_equals(notifications.length, 2);

46 assert_equals(event.data.command, 'get');

47 assert_true(event.data.success);

48	43

49 var notifications = event.data.notifications;	44 // We don't want to make any promises about the order of the

	45 // returned notifications in \|notifications\|.

	46 var firstIndex = notifications[0].title == 'Hello, world!' ? 0 : 1 ;

	47 var secondIndex = firstIndex ? 0 : 1;

50	48

51 assert_equals(notifications.length, 2);	49 assert_equals(notifications[firstIndex].title, 'Hello, world!');

	50 assert_equals(notifications[firstIndex].body, 'First notification' );

52	51

53 // We don't want to make any promises about the order of the	52 assert_equals(notifications[secondIndex].title, 'Hello again, worl d!');

54 // returned notifications in \|notifications\|.	53 assert_equals(notifications[secondIndex].body, 'Second notificatio n');

55 var firstIndex = notifications[0].title == 'Hello, world!' ? 0 : 1;

56 var secondIndex = firstIndex ? 0 : 1;

57	54

58 assert_equals(notifications[firstIndex].title, 'Hello, world!' );	55 test.done();

59 assert_equals(notifications[firstIndex].body, 'First notificat ion');

60

61 assert_equals(notifications[secondIndex].title, 'Hello again, world!');

62 assert_equals(notifications[secondIndex].body, 'Second notific ation');

63

64 test.done();

65 });

66 }).catch(unreached_rejection(test));	56 }).catch(unreached_rejection(test));

67	57

68 }, 'ServiceWorkerRegistration.getNotifications() returns the opened notifi cations within a Service Worker.');	58 }, 'ServiceWorkerRegistration.getNotifications() returns the opened notifi cations within a Service Worker.');

69 </script>	59 </script>

70 </body>	60 </body>

71 </html>	61 </html>

OLD	NEW