| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 // Functions to check the result of JSONP which is evaluated in | 95 // Functions to check the result of JSONP which is evaluated in |
| 96 // thorough-iframe.html by appending <script> element. | 96 // thorough-iframe.html by appending <script> element. |
| 97 var checkJsonpResult = function(expected, url, data) { | 97 var checkJsonpResult = function(expected, url, data) { |
| 98 assert_equals(data.jsonpResult, | 98 assert_equals(data.jsonpResult, |
| 99 expected, | 99 expected, |
| 100 url + ' jsonpResult should match'); | 100 url + ' jsonpResult should match'); |
| 101 }; | 101 }; |
| 102 var checkJsonpHeader = function(name, value, url, data) { | 102 var checkJsonpHeader = function(name, value, url, data) { |
| 103 assert_equals(data.jsonpResult, | 103 assert_equals(data.jsonpResult, |
| 104 'success', | 104 'success', |
| 105 url + ' jsonpResult must be success'); | 105 url + ' jsonpResult must be success (header check name:' + |
| 106 name + ')'); |
| 106 assert_equals(data.headers[name], | 107 assert_equals(data.headers[name], |
| 107 value, | 108 value, |
| 108 'Request header check failed url:' + url + ' name:' + name); | 109 'Request header check failed url:' + url + ' name:' + name); |
| 109 }; | 110 }; |
| 110 var checkJsonpMethod = function(method, url, data) { | 111 var checkJsonpMethod = function(method, url, data) { |
| 111 assert_equals(data.jsonpResult, | 112 assert_equals(data.jsonpResult, |
| 112 'success', | 113 'success', |
| 113 url + ' jsonpResult must be success'); | 114 url + ' jsonpResult must be success (method:' + method + ')'); |
| 114 assert_equals(data.method, | 115 assert_equals(data.method, |
| 115 method, | 116 method, |
| 116 'Method must match url:' + url); | 117 'Method must match url:' + url); |
| 117 }; | 118 }; |
| 118 var checkJsonpAuth = function(username, password, cookie, url, data) { | 119 var checkJsonpAuth = function(username, password, cookie, url, data) { |
| 119 assert_equals(data.jsonpResult, | 120 assert_equals(data.jsonpResult, |
| 120 'success', | 121 'success', |
| 121 url + ' jsonpResult must be success'); | 122 url + ' jsonpResult must be success (username:' + username + |
| 123 ' password:' + password + ' cookie:' + cookie); |
| 122 assert_equals(data.username, | 124 assert_equals(data.username, |
| 123 username, | 125 username, |
| 124 'Username must match. url: ' + url); | 126 'Username must match. url: ' + url); |
| 125 assert_equals(data.password, | 127 assert_equals(data.password, |
| 126 password, | 128 password, |
| 127 'Password must match. url: ' + url); | 129 'Password must match. url: ' + url); |
| 128 assert_equals(data.cookie, | 130 assert_equals(data.cookie, |
| 129 cookie, | 131 cookie, |
| 130 'Cookie must match. url: ' + url); | 132 'Cookie must match. url: ' + url); |
| 131 }; | 133 }; |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 | 409 |
| 408 function executeTests(test_targets) { | 410 function executeTests(test_targets) { |
| 409 for (var i = 0; i < test_targets.length; ++i) { | 411 for (var i = 0; i < test_targets.length; ++i) { |
| 410 promise_test( | 412 promise_test( |
| 411 function(counter, t) { | 413 function(counter, t) { |
| 412 return executeTest(test_targets[counter]); | 414 return executeTest(test_targets[counter]); |
| 413 }.bind(this, i), | 415 }.bind(this, i), |
| 414 "executeTest-" + i); | 416 "executeTest-" + i); |
| 415 } | 417 } |
| 416 } | 418 } |
| OLD | NEW |