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

Unified Diff: LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html

Issue 600393004: [ServiceWorker] Set FetchRequestMode and handle wasFetchedViaServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: delete fetch-cors-xhr-expected.txt Created 6 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: LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html
diff --git a/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html b/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html
index 84095ed20d9e2f334ba113b747c2df0ba2bfe5f7..de805daf9deefc7ac24ff59478b94a311dbf3cff 100644
--- a/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html
+++ b/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html
@@ -3,12 +3,21 @@
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/test-helpers.js?pipe=sub"></script>
+<body>
<script>
async_test(function(t) {
+ var login1 =
+ test_login(t, 'http://127.0.0.1:8000', 'username1', 'password1');
+ var login2 =
+ test_login(t, 'http://localhost:8000', 'username2', 'password2');
var SCOPE = 'resources/fetch-cors-xhr-iframe.html';
var SCRIPT = 'resources/fetch-rewrite-worker.js';
var host_info = get_host_info();
- service_worker_unregister_and_register(t, SCRIPT, SCOPE)
+
+ Promise.all([login1, login2])
+ .then(function() {
+ return service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+ })
.then(function(registration) {
return wait_for_update(t, registration);
})
@@ -21,6 +30,7 @@ async_test(function(t) {
var channel = new MessageChannel();
channel.port1.onmessage = t.step_func(function(e) {
assert_equals(e.data.results, 'finish');
+ unload_iframe(frame);
service_worker_unregister_and_done(t, SCOPE);
});
frame.contentWindow.postMessage({},
@@ -31,3 +41,4 @@ async_test(function(t) {
.catch(unreached_rejection(t));
}, 'Verify CORS XHR of fetch() in a Service Worker');
</script>
+</body>

Powered by Google App Engine
This is Rietveld 408576698