OLD | NEW |
1 <!doctype html> | 1 <!doctype html> |
2 <head> | 2 <head> |
3 <meta name="timeout" content="long"></meta> | 3 <meta name="timeout" content="long"></meta> |
4 <script src = "/resources/testharness.js"></script> | 4 <script src = "/resources/testharness.js"></script> |
5 <script src = "/resources/testharnessreport.js"></script> | 5 <script src = "/resources/testharnessreport.js"></script> |
| 6 <script src = "/resources/get-host-info.js"></script> |
6 <script src = "/serviceworker/resources/test-helpers.js"></script> | 7 <script src = "/serviceworker/resources/test-helpers.js"></script> |
7 <script src = "/fetch/resources/fetch-test-options.js"></script> | 8 <script src = "/fetch/resources/fetch-test-options.js"></script> |
8 <script src = "/fetch/resources/fetch-test-helpers.js"></script> | 9 <script src = "/fetch/resources/fetch-test-helpers.js"></script> |
9 <script src = "/fetch/resources/thorough-util.js"></script> | 10 <script src = "/fetch/resources/thorough-util.js"></script> |
10 <script> | 11 <script> |
11 function onlyOnServiceWorkerProxiedTest(checkFuncs) { | 12 function onlyOnServiceWorkerProxiedTest(checkFuncs) { |
12 return checkFuncs; | 13 return checkFuncs; |
13 } | 14 } |
14 </script> | 15 </script> |
15 <script src = "/fetch/script-tests/thorough/access-control.js?"></script> | 16 <script src = "/fetch/script-tests/thorough/access-control.js?"></script> |
16 </head> | 17 </head> |
17 <body> | 18 <body> |
18 <script> | 19 <script> |
| 20 var host_info = get_host_info(); |
19 function start(t) { | 21 function start(t) { |
20 executeServiceWorkerProxiedTests(TEST_TARGETS); | 22 executeServiceWorkerProxiedTests(TEST_TARGETS); |
21 t.done(); | 23 t.done(); |
22 } | 24 } |
23 function init(test) { | 25 function init(test) { |
24 return login(test) | 26 return login(host_info["HTTP_ORIGIN"], host_info["HTTP_REMOTE_ORIGIN"], test) |
25 .then(function() {return login_https(test);}); | 27 .then(function() { |
| 28 return login(host_info["HTTPS_ORIGIN"], |
| 29 host_info["HTTPS_REMOTE_ORIGIN"], test); |
| 30 }); |
26 } | 31 } |
27 | 32 |
28 </script> | 33 </script> |
29 <script src = "/fetch/resources/init.js"></script> | 34 <script src = "/fetch/resources/init.js"></script> |
30 </body> | 35 </body> |
OLD | NEW |