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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 'success', | 155 'success', |
156 url + ' jsonpResult must be success'); | 156 url + ' jsonpResult must be success'); |
157 assert_equals(data.cookie, | 157 assert_equals(data.cookie, |
158 cookie, | 158 cookie, |
159 'Cookie must match. url: ' + url); | 159 'Cookie must match. url: ' + url); |
160 }; | 160 }; |
161 var checkJsonpError = checkJsonpResult.bind(this, 'error'); | 161 var checkJsonpError = checkJsonpResult.bind(this, 'error'); |
162 var checkJsonpSuccess = checkJsonpResult.bind(this, 'success'); | 162 var checkJsonpSuccess = checkJsonpResult.bind(this, 'success'); |
163 var checkJsonpNoRedirect = checkJsonpResult.bind(this, 'noredirect'); | 163 var checkJsonpNoRedirect = checkJsonpResult.bind(this, 'noredirect'); |
164 var hasCustomHeader = | 164 var hasCustomHeader = |
165 checkJsonpHeader.bind(this, 'x-serviceworker-test', 'test'); | 165 checkJsonpHeader.bind(this, 'X-ServiceWorker-Test', 'test'); |
166 var hasCustomHeader2 = function(url, data) { | 166 var hasCustomHeader2 = function(url, data) { |
167 checkJsonpHeader('x-serviceworker-s', 'test1', url, data); | 167 checkJsonpHeader('X-ServiceWorker-s', 'test1', url, data); |
168 checkJsonpHeader('x-serviceworker-test', 'test2,test3', url, data); | 168 checkJsonpHeader('X-ServiceWorker-Test', 'test2,test3', url, data); |
169 checkJsonpHeader('x-serviceworker-ua', 'test4', url, data); | 169 checkJsonpHeader('X-ServiceWorker-ua', 'test4', url, data); |
170 checkJsonpHeader('x-serviceworker-u', 'test5', url, data); | 170 checkJsonpHeader('X-ServiceWorker-U', 'test5', url, data); |
171 checkJsonpHeader('x-serviceworker-v', 'test6', url, data); | 171 checkJsonpHeader('X-ServiceWorker-V', 'test6', url, data); |
172 }; | 172 }; |
173 var noCustomHeader = | 173 var noCustomHeader = |
174 checkJsonpHeader.bind(this, 'x-serviceworker-test', undefined); | 174 checkJsonpHeader.bind(this, 'X-ServiceWorker-Test', undefined); |
175 var methodIsGET = checkJsonpMethod.bind(this, 'GET'); | 175 var methodIsGET = checkJsonpMethod.bind(this, 'GET'); |
176 var methodIsPOST = checkJsonpMethod.bind(this, 'POST'); | 176 var methodIsPOST = checkJsonpMethod.bind(this, 'POST'); |
177 var methodIsPUT = checkJsonpMethod.bind(this, 'PUT'); | 177 var methodIsPUT = checkJsonpMethod.bind(this, 'PUT'); |
178 var methodIsXXX = checkJsonpMethod.bind(this, 'XXX'); | 178 var methodIsXXX = checkJsonpMethod.bind(this, 'XXX'); |
179 var authCheckNone = | 179 var authCheckNone = |
180 checkJsonpAuth.bind(this, 'undefined', 'undefined', 'undefined'); | 180 checkJsonpAuth.bind(this, 'undefined', 'undefined', 'undefined'); |
181 var authCheck1 = checkJsonpAuth.bind(this, 'username1', 'password1', 'cookie1'); | 181 var authCheck1 = checkJsonpAuth.bind(this, 'username1', 'password1', 'cookie1'); |
182 var authCheck2 = checkJsonpAuth.bind(this, 'username2', 'password2', 'cookie2'); | 182 var authCheck2 = checkJsonpAuth.bind(this, 'username2', 'password2', 'cookie2'); |
183 | 183 |
184 var cookieCheck1 = checkJsonpCookie.bind(this, 'cookie1'); | 184 var cookieCheck1 = checkJsonpCookie.bind(this, 'cookie1'); |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 | 444 |
445 function executeTests(test_targets) { | 445 function executeTests(test_targets) { |
446 for (var i = 0; i < test_targets.length; ++i) { | 446 for (var i = 0; i < test_targets.length; ++i) { |
447 promise_test( | 447 promise_test( |
448 function(counter, t) { | 448 function(counter, t) { |
449 return executeTest(test_targets[counter]); | 449 return executeTest(test_targets[counter]); |
450 }.bind(this, i), | 450 }.bind(this, i), |
451 "executeTest-" + i); | 451 "executeTest-" + i); |
452 } | 452 } |
453 } | 453 } |
OLD | NEW |