Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/fetch/resources/thorough-util.js

Issue 2524703002: Introduce Response.redirect attribute and add LayoutTest. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/fetch.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 var SCOPE = BASE_ORIGIN + 1 var SCOPE = BASE_ORIGIN +
falken 2016/12/09 06:42:02 In CL description: Response.redirected not .redire
horo 2016/12/09 08:19:53 Done.
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@');
11 var OTHER_BASE_URL_WITH_PASSWORD = 11 var OTHER_BASE_URL_WITH_PASSWORD =
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'header check failed url: ' + url + ' name: ' + name); 58 'header check failed url: ' + url + ' name: ' + name);
59 }; 59 };
60 var checkFetchResponseType = function(type, url, data) { 60 var checkFetchResponseType = function(type, url, data) {
61 assert_equals(data.fetchResult, 61 assert_equals(data.fetchResult,
62 'resolved', 62 'resolved',
63 'fetchResult must be resolved. url = ' + url); 63 'fetchResult must be resolved. url = ' + url);
64 assert_equals(data.type, 64 assert_equals(data.type,
65 type, 65 type,
66 'type must match. url: ' + url); 66 'type must match. url: ' + url);
67 }; 67 };
68 var checkFetchResponseRedirected = function(expected, url, data) {
69 assert_equals(data.fetchResult,
70 'resolved',
71 'fetchResult must be resolved. url = ' + url);
72 assert_equals(data.redirected,
73 expected,
74 url + ' redirected flag should match');
75 };
68 var checkURLList = function(redirectedURLList, url, data) { 76 var checkURLList = function(redirectedURLList, url, data) {
69 if (!self.internals) 77 if (!self.internals)
70 return; 78 return;
71 var expectedURLList = [url].concat(redirectedURLList); 79 var expectedURLList = [url].concat(redirectedURLList);
72 assert_equals(data.fetchResult, 80 assert_equals(data.fetchResult,
73 'resolved', 81 'resolved',
74 'fetchResult must be resolved. url = ' + url); 82 'fetchResult must be resolved. url = ' + url);
75 assert_array_equals(data.urlList, 83 assert_array_equals(data.urlList,
76 expectedURLList, 84 expectedURLList,
77 url + ' URL list should match'); 85 url + ' URL list should match');
(...skipping 17 matching lines...) Expand all
95 checkFetchResponseHeader.bind(this, 'content-type', true); 103 checkFetchResponseHeader.bind(this, 'content-type', true);
96 var noContentType = 104 var noContentType =
97 checkFetchResponseHeader.bind(this, 'content-type', false); 105 checkFetchResponseHeader.bind(this, 'content-type', false);
98 var hasServerHeader = 106 var hasServerHeader =
99 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true); 107 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', true);
100 var noServerHeader = 108 var noServerHeader =
101 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false); 109 checkFetchResponseHeader.bind(this, 'x-serviceworker-serverheader', false);
102 var typeBasic = checkFetchResponseType.bind(this, 'basic'); 110 var typeBasic = checkFetchResponseType.bind(this, 'basic');
103 var typeCors = checkFetchResponseType.bind(this, 'cors'); 111 var typeCors = checkFetchResponseType.bind(this, 'cors');
104 var typeOpaque = checkFetchResponseType.bind(this, 'opaque'); 112 var typeOpaque = checkFetchResponseType.bind(this, 'opaque');
113 var responseRedirected = checkFetchResponseRedirected.bind(this, true);
114 var responseNotRedirected = checkFetchResponseRedirected.bind(this, false);
105 115
106 // Functions to check the result of JSONP which is evaluated in 116 // Functions to check the result of JSONP which is evaluated in
107 // thorough-iframe.html by appending <script> element. 117 // thorough-iframe.html by appending <script> element.
108 var checkJsonpResult = function(expected, url, data) { 118 var checkJsonpResult = function(expected, url, data) {
109 assert_equals(data.jsonpResult, 119 assert_equals(data.jsonpResult,
110 expected, 120 expected,
111 url + ' jsonpResult should match'); 121 url + ' jsonpResult should match');
112 }; 122 };
113 var checkJsonpHeader = function(name, value, url, data) { 123 var checkJsonpHeader = function(name, value, url, data) {
114 assert_equals(data.jsonpResult, 124 assert_equals(data.jsonpResult,
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 // Setting a comment will fail the test and show the 368 // Setting a comment will fail the test and show the
359 // comment in the result. Use this for debugging 369 // comment in the result. Use this for debugging
360 // tests. 370 // tests.
361 comment: undefined, 371 comment: undefined,
362 372
363 fetchResult: 'resolved', 373 fetchResult: 'resolved',
364 body: body, 374 body: body,
365 status: response.status, 375 status: response.status,
366 headers: headersToArray(response.headers), 376 headers: headersToArray(response.headers),
367 type: response.type, 377 type: response.type,
378 redirected: response.redirected,
368 urlList: self.internals ? 379 urlList: self.internals ?
369 self.internals.getInternalResponseURLList(response) : 380 self.internals.getInternalResponseURLList(response) :
370 [], 381 [],
371 response: response, 382 response: response,
372 originalURL: originalURL 383 originalURL: originalURL
373 }); 384 });
374 }) 385 })
375 .catch(function(e) { 386 .catch(function(e) {
376 return Promise.resolve({fetchResult: 'error'}); 387 return Promise.resolve({fetchResult: 'error'});
377 }); 388 });
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 438
428 function executeTests(test_targets) { 439 function executeTests(test_targets) {
429 for (var i = 0; i < test_targets.length; ++i) { 440 for (var i = 0; i < test_targets.length; ++i) {
430 promise_test( 441 promise_test(
431 function(counter, t) { 442 function(counter, t) {
432 return executeTest(test_targets[counter]); 443 return executeTest(test_targets[counter]);
433 }.bind(this, i), 444 }.bind(this, i),
434 "executeTest-" + i); 445 "executeTest-" + i);
435 } 446 }
436 } 447 }
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/fetch.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698