Index: LayoutTests/http/tests/serviceworker/waiting.html |
diff --git a/LayoutTests/http/tests/serviceworker/waiting.html b/LayoutTests/http/tests/serviceworker/waiting.html |
index 742a9fc64058f9509b16e713d7e25cb7cf7922ac..c070e5f3e657f1115e578fc3d1892311e890d85c 100644 |
--- a/LayoutTests/http/tests/serviceworker/waiting.html |
+++ b/LayoutTests/http/tests/serviceworker/waiting.html |
@@ -11,6 +11,7 @@ async_test(function(t) { |
var url = 'resources/worker-no-op.js'; |
var scope = 'resources/blank.html'; |
var frame; |
+ var registration; |
navigator.serviceWorker.unregister(scope) |
.then(step(function() { return with_iframe(scope); }), |
@@ -19,15 +20,19 @@ async_test(function(t) { |
frame = f; |
return navigator.serviceWorker.register(url, {scope: scope}); |
})) |
+ .then(step(function(r) { |
+ registration = r; |
+ return wait_for_update(t, registration); |
+ })) |
.then(step(function(serviceWorker) { |
return wait_for_state(t, serviceWorker, 'installed'); |
}), unreached_rejection(t, 'Registration should not fail')) |
.then(step(function() { |
var container = frame.contentWindow.navigator.serviceWorker; |
falken
2014/08/14 14:23:15
probably better to remove or make it "var controll
nhiroki
2014/08/14 16:37:54
Done.
|
assert_equals(container.controller, null); |
- assert_equals(container.active, null); |
- assert_equals(container.waiting.scriptURL, normalizeURL(url)); |
- assert_equals(container.installing, null); |
+ assert_equals(registration.active, null); |
+ assert_equals(registration.waiting.scriptURL, normalizeURL(url)); |
+ assert_equals(registration.installing, null); |
// FIXME: Add a test for a frame created after installation. |
// Should the existing frame ("frame") block activation? |