OLD | NEW |
1 var SCOPE = BASE_ORIGIN + | 1 var SCOPE = BASE_ORIGIN + |
2 '/fetch/resources/thorough-iframe.html?' + TEST_OPTIONS; | 2 '/fetch/resources/thorough-iframe.html?' + TEST_OPTIONS; |
3 var IFRAME_ORIGIN = BASE_ORIGIN; | 3 var IFRAME_ORIGIN = BASE_ORIGIN; |
4 var BASE_URL = BASE_ORIGIN + | 4 var BASE_URL = BASE_ORIGIN + |
5 '/serviceworker/resources/fetch-access-control.php?'; | 5 '/serviceworker/resources/fetch-access-control.php?'; |
6 var OTHER_BASE_URL = OTHER_ORIGIN + | 6 var OTHER_BASE_URL = OTHER_ORIGIN + |
7 '/serviceworker/resources/fetch-access-control.php?'; | 7 '/serviceworker/resources/fetch-access-control.php?'; |
8 var BASE_URL_WITH_USERNAME = BASE_URL.replace('://', '://user@'); | 8 var BASE_URL_WITH_USERNAME = BASE_URL.replace('://', '://user@'); |
9 var OTHER_BASE_URL_WITH_USERNAME = OTHER_BASE_URL.replace('://', '://user@'); | 9 var OTHER_BASE_URL_WITH_USERNAME = OTHER_BASE_URL.replace('://', '://user@'); |
10 var BASE_URL_WITH_PASSWORD = BASE_URL.replace('://', '://user:pass@'); | 10 var BASE_URL_WITH_PASSWORD = BASE_URL.replace('://', '://user:pass@'); |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 checkFetchResponseHeader.bind(this, 'content-type', true); | 103 checkFetchResponseHeader.bind(this, 'content-type', true); |
104 var noContentType = | 104 var noContentType = |
105 checkFetchResponseHeader.bind(this, 'content-type', false); | 105 checkFetchResponseHeader.bind(this, 'content-type', false); |
106 var hasServerHeader = | 106 var hasServerHeader = |
107 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true); | 107 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true); |
108 var noServerHeader = | 108 var noServerHeader = |
109 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false); | 109 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false); |
110 var typeBasic = checkFetchResponseType.bind(this, 'basic'); | 110 var typeBasic = checkFetchResponseType.bind(this, 'basic'); |
111 var typeCors = checkFetchResponseType.bind(this, 'cors'); | 111 var typeCors = checkFetchResponseType.bind(this, 'cors'); |
112 var typeOpaque = checkFetchResponseType.bind(this, 'opaque'); | 112 var typeOpaque = checkFetchResponseType.bind(this, 'opaque'); |
| 113 var typeOpaqueredirect = checkFetchResponseType.bind(this, 'opaqueredirect'); |
113 var responseRedirected = checkFetchResponseRedirected.bind(this, true); | 114 var responseRedirected = checkFetchResponseRedirected.bind(this, true); |
114 var responseNotRedirected = checkFetchResponseRedirected.bind(this, false); | 115 var responseNotRedirected = checkFetchResponseRedirected.bind(this, false); |
115 | 116 |
116 // Functions to check the result of JSONP which is evaluated in | 117 // Functions to check the result of JSONP which is evaluated in |
117 // thorough-iframe.html by appending <script> element. | 118 // thorough-iframe.html by appending <script> element. |
118 var checkJsonpResult = function(expected, url, data) { | 119 var checkJsonpResult = function(expected, url, data) { |
119 assert_equals(data.jsonpResult, | 120 assert_equals(data.jsonpResult, |
120 expected, | 121 expected, |
121 url + ' jsonpResult should match'); | 122 url + ' jsonpResult should match'); |
122 }; | 123 }; |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 } | 301 } |
301 | 302 |
302 function getRequestInit(params) { | 303 function getRequestInit(params) { |
303 var init = {}; | 304 var init = {}; |
304 if (params['method']) { | 305 if (params['method']) { |
305 init['method'] = params['method']; | 306 init['method'] = params['method']; |
306 } | 307 } |
307 if (params['mode']) { | 308 if (params['mode']) { |
308 init['mode'] = params['mode']; | 309 init['mode'] = params['mode']; |
309 } | 310 } |
| 311 if (params['redirectmode']) { |
| 312 init['redirect'] = params['redirectmode']; |
| 313 } |
310 if (params['credentials']) { | 314 if (params['credentials']) { |
311 init['credentials'] = params['credentials']; | 315 init['credentials'] = params['credentials']; |
312 } | 316 } |
313 if (params['headers'] === 'CUSTOM') { | 317 if (params['headers'] === 'CUSTOM') { |
314 init['headers'] = {'X-ServiceWorker-Test': 'test'}; | 318 init['headers'] = {'X-ServiceWorker-Test': 'test'}; |
315 } else if (params['headers'] === 'CUSTOM2') { | 319 } else if (params['headers'] === 'CUSTOM2') { |
316 init['headers'] = [['X-ServiceWorker-Test', 'test2'], | 320 init['headers'] = [['X-ServiceWorker-Test', 'test2'], |
317 ['X-ServiceWorker-ua', 'test4'], | 321 ['X-ServiceWorker-ua', 'test4'], |
318 ['X-ServiceWorker-V', 'test6'], | 322 ['X-ServiceWorker-V', 'test6'], |
319 ['X-ServiceWorker-s', 'test1'], | 323 ['X-ServiceWorker-s', 'test1'], |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 | 448 |
445 function executeTests(test_targets) { | 449 function executeTests(test_targets) { |
446 for (var i = 0; i < test_targets.length; ++i) { | 450 for (var i = 0; i < test_targets.length; ++i) { |
447 promise_test( | 451 promise_test( |
448 function(counter, t) { | 452 function(counter, t) { |
449 return executeTest(test_targets[counter]); | 453 return executeTest(test_targets[counter]); |
450 }.bind(this, i), | 454 }.bind(this, i), |
451 "executeTest-" + i); | 455 "executeTest-" + i); |
452 } | 456 } |
453 } | 457 } |
OLD | NEW |