third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html - Issue 2862353002: Upstream service worker `fetch` tests to WPT

Side by Side Diff: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html

Issue 2862353002: Upstream service worker `fetch` tests to WPT (Closed)

Patch Set: Created 3 years, 7 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:

« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-response-xhr.https.html » ('j') | third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/fetch-response-xhr.https.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <title>Service Worker: the body of FetchEvent using XMLHttpRequest</title>	2 <title>Service Worker: the body of FetchEvent using XMLHttpRequest</title>

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

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

5 <script src="/common/get-host-info.sub.js"></script>	5 <script src="/common/get-host-info.sub.js"></script>

6 <script src="resources/test-helpers.sub.js?pipe=sub"></script>	6 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
	Marijn Kruisselbrink 2017/05/05 23:59:00 nit: no need for pipe=sub nit: no need for pipe=sub mike3 2017/05/08 18:41:40 Done. Show quoted text On 2017/05/05 23:59:00, Marijn Kruisselbrink wrote: > nit: no need for pipe=sub Done.
7 <script>	7 <script>

8 async_test(function(t) {	8 async_test(function(t) {

9 var SCOPE = 'resources/fetch-request-xhr-iframe.https.html';	9 var SCOPE = 'resources/fetch-request-xhr-iframe.https.html';

10 var SCRIPT = 'resources/fetch-request-xhr-worker.js';	10 var SCRIPT = 'resources/fetch-request-xhr-worker.js';

11 var host_info = get_host_info();	11 var host_info = get_host_info();

12 service_worker_unregister_and_register(t, SCRIPT, SCOPE)	12 service_worker_unregister_and_register(t, SCRIPT, SCOPE)

13 .then(function(registration) {	13 .then(function(registration) {

14 return wait_for_state(t, registration.installing, 'activated');	14 return wait_for_state(t, registration.installing, 'activated');

15 })	15 })

16 .then(function() { return with_iframe(SCOPE); })	16 .then(function() { return with_iframe(SCOPE); })

17 .then(function(frame) {	17 .then(function(frame) {

	18 t.add_cleanup(function() { frame.remove(); });

18 var channel = new MessageChannel();	19 var channel = new MessageChannel();

19 channel.port1.onmessage = t.step_func(function(e) {	20 channel.port1.onmessage = t.step_func(function(e) {
	Marijn Kruisselbrink 2017/05/05 23:59:00 random thought: it seems like this test could be c random thought: it seems like this test could be cleaned up a bit by using fetch_tests_from_window (i.e. rather than the custom MessageChannel/postMessage protocol, you could just use that to have regular testharness.js tests in the iframe, and load the results that way). Not sure how cleanup/uninstalling the service worker would be dealt with in that case though... mike3 2017/05/08 18:41:40 I've been working on an extension to the "multiglo Show quoted text On 2017/05/05 23:59:00, Marijn Kruisselbrink wrote: > random thought: it seems like this test could be cleaned up a bit by using > fetch_tests_from_window (i.e. rather than the custom MessageChannel/postMessage > protocol, you could just use that to have regular testharness.js tests in the > iframe, and load the results that way). Not sure how cleanup/uninstalling the > service worker would be dealt with in that case though... I've been working on an extension to the "multiglobal" tests to support Service Workers: https://github.com/bocoup/web-platform-tests/commit/f6775c1991db37973b162d769... Since this test requires an iframe, it's not directly applicable, but it does introduce a callback to `fetch_test_from_worker`, which suggests that a similar extension to `fetch_test_from_window` might make sense. Still, that's a little ways off, though, so I think I'd like to land this particular test as-is. Marijn Kruisselbrink 2017/05/08 19:05:13 Agreed, landing as is is fine. Adding a done callb Show quoted text On 2017/05/08 at 18:41:40, mike3 wrote: > On 2017/05/05 23:59:00, Marijn Kruisselbrink wrote: > > random thought: it seems like this test could be cleaned up a bit by using > > fetch_tests_from_window (i.e. rather than the custom MessageChannel/postMessage > > protocol, you could just use that to have regular testharness.js tests in the > > iframe, and load the results that way). Not sure how cleanup/uninstalling the > > service worker would be dealt with in that case though... > > I've been working on an extension to the "multiglobal" tests to support Service > Workers: > > https://github.com/bocoup/web-platform-tests/commit/f6775c1991db37973b162d769... > > Since this test requires an iframe, it's not directly applicable, but it does > introduce a callback to `fetch_test_from_worker`, which suggests that a similar > extension to `fetch_test_from_window` might make sense. Still, that's a little > ways off, though, so I think I'd like to land this particular test as-is. Agreed, landing as is is fine. Adding a done callback like in that CL does seem like a good idea, yes. Or maybe a generic async cleanup mechanism...
20 if (e.data.results === 'finish') {	21 if (e.data.results === 'finish') {

21 frame.remove();

22 service_worker_unregister_and_done(t, SCOPE);	22 service_worker_unregister_and_done(t, SCOPE);

23 } else if (e.data.results == 'equals') {	23 } else if (e.data.results == 'equals') {

24 assert_equals(e.data.got, e.data.expected);	24 assert_equals(e.data.got, e.data.expected);

	25 } else if (e.data.results == 'array_equals') {

	26 assert_array_equals(e.data.got, e.data.expected, e.data.msg);

	27 } else if (e.data.results == 'failure') {

	28 throw e.data.error;

25 }	29 }

26 });	30 });

27 frame.contentWindow.postMessage({},	31 frame.contentWindow.postMessage({},

28 host_info['HTTPS_ORIGIN'],	32 host_info['HTTPS_ORIGIN'],

29 [channel.port2]);	33 [channel.port2]);

30 })	34 })

31 .catch(unreached_rejection(t));	35 .catch(unreached_rejection(t));

32 }, 'Verify the body of FetchEvent using XMLHttpRequest');	36 }, 'Verify the body of FetchEvent using XMLHttpRequest');

33 </script>	37 </script>

OLD	NEW