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

Unified Diff: LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker.html

Issue 1314123002: Remove hard-coded origins in layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix fetch(...) tests relying on hard-coded origins. Created 5 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/fetch/script-tests/thorough/TEMPLATE-serviceworker.html
diff --git a/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker.html b/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker.html
index 6d7e952838e929c5a55bf3a26f0e9cafdb48e4d0..b942706d31645bcc585bd46ccc5b09fcacf9c987 100644
--- a/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker.html
+++ b/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker.html
@@ -3,10 +3,12 @@
<meta name="timeout" content="long"></meta>
<script src = "/resources/testharness.js"></script>
<script src = "/resources/testharnessreport.js"></script>
+<script src = "/resources/get-host-info.js?pipe=sub"></script>
<script src = "/serviceworker/resources/test-helpers.js"></script>
</head>
<body>
<script>
+var host_info = get_host_info();
function start(t) {
service_worker_test(
'/fetch/script-tests/thorough/TESTNAME.js?OPTIONS',
@@ -14,8 +16,10 @@ function start(t) {
t.done();
}
function init(test) {
- return login(test)
- .then(function() {return login_https(test);});
+ return login(host_info['HTTP_ORIGIN'], host_info['HTTP_REMOTE_ORIGIN'], test)
+ .then(function() {
+ return login(host_info['HTTPS_ORIGIN'], host_info['HTTPS_REMOTE_ORIGIN'],
+ test);});
}
</script>
<script src = "/fetch/resources/init.js"></script>

Powered by Google App Engine
This is Rietveld 408576698