Index: LayoutTests/http/tests/serviceworker/fetch-event-after-navigation-within-page.html |
diff --git a/LayoutTests/http/tests/serviceworker/fetch-event-after-navigation-within-page.html b/LayoutTests/http/tests/serviceworker/fetch-event-after-navigation-within-page.html |
index c1c16811194ff9705a8777e943fbc2dfebad5d4b..fc91430e9a36eca684faae6b50ab4de750ecacf0 100644 |
--- a/LayoutTests/http/tests/serviceworker/fetch-event-after-navigation-within-page.html |
+++ b/LayoutTests/http/tests/serviceworker/fetch-event-after-navigation-within-page.html |
@@ -3,17 +3,18 @@ |
<script src="../resources/testharness.js"></script> |
<script src="../resources/testharnessreport.js"></script> |
<script src="resources/test-helpers.js"></script> |
+<script src="../fetch/resources/fetch-test-helpers.js"></script> |
falken
2015/06/05 01:36:39
Can you explain why we need sequential_promise_tes
jungkees
2015/06/05 02:08:13
As you pointed, it shouldn't have to be using sequ
|
<body> |
<script> |
-promise_test(function(t) { |
+sequential_promise_test(function(t) { |
var scope = |
'resources/fetch-event-after-navigation-within-page-iframe.html' + |
'?hashchange'; |
var worker = 'resources/simple-intercept-worker.js'; |
var frame; |
- service_worker_unregister_and_register(t, worker, scope) |
+ return service_worker_unregister_and_register(t, worker, scope) |
.then(function(reg) { |
return wait_for_state(t, reg.installing, 'activated'); |
}) |
@@ -30,18 +31,18 @@ promise_test(function(t) { |
.then(function(response) { |
assert_equals(response, 'intercepted by service worker'); |
frame.remove(); |
- return service_worker_unregister_and_done(t, scope); |
+ return service_worker_unregister(t, scope); |
}) |
}, 'Service Worker should respond to fetch event after the hash changes'); |
-promise_test(function(t) { |
+sequential_promise_test(function(t) { |
var scope = |
'resources/fetch-event-after-navigation-within-page-iframe.html' + |
'?pushState'; |
var worker = 'resources/simple-intercept-worker.js'; |
var frame; |
- service_worker_unregister_and_register(t, worker, scope) |
+ return service_worker_unregister_and_register(t, worker, scope) |
.then(function(reg) { |
return wait_for_state(t, reg.installing, 'activated'); |
}) |
@@ -58,8 +59,10 @@ promise_test(function(t) { |
.then(function(response) { |
assert_equals(response, 'intercepted by service worker'); |
frame.remove(); |
- return service_worker_unregister_and_done(t, scope); |
+ return service_worker_unregister(t, scope); |
}) |
}, 'Service Worker should respond to fetch event after the pushState'); |
+sequential_promise_test_done(); |
falken
2015/06/05 01:36:39
nit: newline above this
jungkees
2015/06/05 02:08:13
Resolved by removing this call.
|
+done(); |
</script> |