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

Unified Diff: LayoutTests/http/tests/serviceworker/fetch.html

Issue 466723002: ServiceWorker: Enable ServiceWorkerRegistration and update layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@updatefound
Patch Set: update comments in service-worker-gc.html Created 6 years, 4 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: LayoutTests/http/tests/serviceworker/fetch.html
diff --git a/LayoutTests/http/tests/serviceworker/fetch.html b/LayoutTests/http/tests/serviceworker/fetch.html
index 95f43bf97948e9d9e09962f7d51cd814a6c3b7b9..6361926ce1c7a63d4fb718ab37077246b6dfd2db 100644
--- a/LayoutTests/http/tests/serviceworker/fetch.html
+++ b/LayoutTests/http/tests/serviceworker/fetch.html
@@ -4,35 +4,38 @@
<script src="../resources/testharnessreport.js"></script>
<script src="resources/test-helpers.js"></script>
<script>
-var test = async_test('Verify fetch() in a Service Worker');
-test.step(function() {
+async_test(function(t) {
var scope = 'resources/blank.html';
service_worker_unregister_and_register(
- test, 'resources/fetch-worker.js', scope).then(test.step_func(onRegister));
-
- function onRegister(worker) {
- var messageChannel = new MessageChannel();
- messageChannel.port1.onmessage = test.step_func(onMessage);
- worker.postMessage({port: messageChannel.port2}, [messageChannel.port2]);
- }
-
+ t, 'resources/fetch-worker.js', scope)
falken 2014/08/14 14:23:14 i think this is wrapped, so it should be indented
nhiroki 2014/08/14 16:37:53 Done.
+ .then(function(registration) {
+ return wait_for_update(t, registration);
+ })
+ .then(function(sw) {
+ var messageChannel = new MessageChannel();
+ messageChannel.port1.onmessage = t.step_func(onMessage);
+ sw.postMessage({port: messageChannel.port2}, [messageChannel.port2]);
+ })
+ .catch(unreached_rejection(t));
+
var result = [];
var expected = [
- 'Resolved: other.html [200]OK',
- 'Rejected: http:// : Invalid URL',
- 'Rejected: http://www.example.com/foo : Failed to fetch',
- 'Resolved: fetch-status.php?status=200 [200]OK',
- 'Resolved: fetch-status.php?status=404 [404]Not Found',
+ 'Resolved: other.html [200]OK',
+ 'Rejected: http:// : Invalid URL',
+ 'Rejected: http://www.example.com/foo : Failed to fetch',
+ 'Resolved: fetch-status.php?status=200 [200]OK',
+ 'Resolved: fetch-status.php?status=404 [404]Not Found',
];
function onMessage(e) {
- var message = e.data;
- if (message == 'quit') {
- assert_array_equals(result, expected, 'Worker should post back expected values.');
- service_worker_unregister_and_done(test, scope);
- } else {
- result.push(message);
- }
+ var message = e.data;
+ if (message == 'quit') {
+ assert_array_equals(result, expected,
+ 'Worker should post back expected values.');
+ service_worker_unregister_and_done(t, scope);
+ } else {
+ result.push(message);
+ }
}
-});
+ }, 'Verify fetch() in a Service Worker');
</script>

Powered by Google App Engine
This is Rietveld 408576698