| OLD | NEW |
| 1 if (self.importScripts) { | 1 if (self.importScripts) { |
| 2 importScripts('/resources/testharness.js'); | 2 importScripts('/resources/testharness.js'); |
| 3 importScripts('/serviceworker/resources/test-helpers.js'); | 3 importScripts('/serviceworker/resources/test-helpers.js'); |
| 4 importScripts('/fetch/resources/fetch-test-options.js'); | 4 importScripts('/fetch/resources/fetch-test-options.js'); |
| 5 } | 5 } |
| 6 | 6 |
| 7 function getContentType(headers) { | 7 function getContentType(headers) { |
| 8 var content_type = ''; | 8 var content_type = ''; |
| 9 for (var header of headers) { | 9 for (var header of headers) { |
| 10 if (header[0] == 'content-type') | 10 if (header[0] == 'content-type') |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 if (mode !== 'same-origin') { | 209 if (mode !== 'same-origin') { |
| 210 assert_unreached( | 210 assert_unreached( |
| 211 'Test 5: Cross-origin HTTPS request must success: ' + | 211 'Test 5: Cross-origin HTTPS request must success: ' + |
| 212 'mode = ' + mode); | 212 'mode = ' + mode); |
| 213 } | 213 } |
| 214 }); | 214 }); |
| 215 }); | 215 }); |
| 216 }, 'Block fetch() as mixed content (' + mode + ')'); | 216 }, 'Block fetch() as mixed content (' + mode + ')'); |
| 217 } | 217 } |
| 218 | 218 |
| 219 function add_referrer_tests(tests) { | 219 function add_referrer_tests(tests, global) { |
| 220 global = global || self; |
| 220 for (let test of tests) { | 221 for (let test of tests) { |
| 221 let url = test[0]; | 222 let url = test[0]; |
| 222 let referrer = test[1]; | 223 let referrer = test[1]; |
| 223 let policy = test[2]; | 224 let policy = test[2]; |
| 224 let expected = test[3]; | 225 let expected = test[3]; |
| 225 promise_test(t => { | 226 promise_test(t => { |
| 226 var request = new Request(url, | 227 var request = new Request(url, |
| 227 {referrer: referrer, referrerPolicy: policy, mode: 'cors'}); | 228 {referrer: referrer, referrerPolicy: policy, mode: 'cors'}); |
| 228 return fetch(new Request(url, request)).then(res => { | 229 return global.fetch(new Request(url, request)).then(res => { |
| 229 return res.json(); | 230 return res.json(); |
| 230 }).then(json => { | 231 }).then(json => { |
| 231 assert_equals(json.referrer, expected, 'referrer'); | 232 assert_equals(json.referrer, expected, 'referrer'); |
| 232 }); | 233 }); |
| 233 }, | 234 }, |
| 234 `referrer test: url = ${url}, referrer = ${referrer}, policy = ${policy}`); | 235 `referrer test: url = ${url}, referrer = ${referrer}, policy = ${policy}`); |
| 235 } | 236 } |
| 236 } | 237 } |
| OLD | NEW |