Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/unregister-controller.https.html

Issue 2415873002: Import w3c tests for the service workers (Closed)
Patch Set: Rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/unregister-controller.https.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/unregister-controller.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/unregister-controller.https.html
similarity index 90%
copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/unregister-controller.html
copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/unregister-controller.https.html
index fc05f7763f5914fe733b6a04dead432d58a374ff..3bf4cff7200e71a7ad157f97f60e0bca45693485 100644
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/unregister-controller.html
+++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/unregister-controller.https.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
-<script src="resources/test-helpers.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
<script>
var worker_url = 'resources/simple-intercept-worker.js';
@@ -11,6 +11,7 @@ async_test(function(t) {
var frame_window;
var controller;
var registration;
+ var frame;
service_worker_unregister_and_register(t, worker_url, scope)
.then(function(r) {
@@ -20,7 +21,8 @@ async_test(function(t) {
.then(function() {
return with_iframe(scope);
})
- .then(function(frame) {
+ .then(function(f) {
+ frame = f;
frame_window = frame.contentWindow;
controller = frame_window.navigator.serviceWorker.controller;
assert_true(controller instanceof frame_window.ServiceWorker,
@@ -36,6 +38,7 @@ async_test(function(t) {
.then(function(response) {
assert_equals(response, 'intercepted by service worker',
'controller should intercept requests');
+ frame.remove();
t.done();
})
.catch(unreached_rejection(t));
@@ -45,6 +48,7 @@ async_test(function(t) {
var scope =
'resources/unregister-controller-page.html?load-after-unregister';
var registration;
+ var frame;
service_worker_unregister_and_register(t, worker_url, scope)
.then(function(r) {
@@ -57,7 +61,8 @@ async_test(function(t) {
.then(function() {
return with_iframe(scope);
})
- .then(function(frame) {
+ .then(function(f) {
+ frame = f;
var frame_window = frame.contentWindow;
assert_equals(frame_window.navigator.serviceWorker.controller, null,
'document should not have a controller');
@@ -66,6 +71,7 @@ async_test(function(t) {
.then(function(response) {
assert_equals(response, 'a simple text file\n',
'requests should not be intercepted');
+ frame.remove();
t.done();
})
.catch(unreached_rejection(t));
@@ -94,6 +100,7 @@ async_test(function(t) {
assert_equals(frame.contentWindow.navigator.serviceWorker.controller,
null,
'document should not have a controller');
+ frame.remove();
t.done();
})
.catch(unreached_rejection(t));

Powered by Google App Engine
This is Rietveld 408576698