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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js

Issue 2550363002: Add LayoutTests for URL list of Response (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 side-by-side diff with in-line comments
Download patch
« third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/response.js ('K') | « third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/response.js ('k') | third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-loop.js » ('j') | third_party/WebKit/LayoutTests/http/tests/serviceworker/redirected-response.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
index a47e699714b9d4366ed7bf51e6c0cc19b51fe19b..2ddfe780fff050146a0f02f7572549cf927d31dd 100644
--- a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
+++ b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect.js
@@ -7,7 +7,8 @@ var TEST_TARGETS = [
// Redirect: same origin -> same origin
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=GET',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, authCheck1]],
// https://fetch.spec.whatwg.org/#concept-http-fetch
@@ -15,7 +16,7 @@ var TEST_TARGETS = [
// Step 2: If location is null, return response.
[REDIRECT_URL + 'noLocation' +
'&mode=same-origin&method=GET&NoRedirectTest=true',
- [fetchResolved, hasBody, typeBasic],
+ [fetchResolved, hasBody, typeBasic, checkURLList.bind(self, [])],
[checkJsonpNoRedirect]],
// Step 5: If locationURL is failure, return a network error.
[REDIRECT_URL + 'http://' +
@@ -24,29 +25,34 @@ var TEST_TARGETS = [
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=GET&headers=CUSTOM',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, hasCustomHeader, authCheck1]],
// Chrome changes the method from POST to GET when it recieves 301 redirect
// response. See a note in http://tools.ietf.org/html/rfc7231#section-6.4.2
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=POST&Status=301',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, authCheck1]],
// Chrome changes the method from POST to GET when it recieves 302 redirect
// response. See a note in http://tools.ietf.org/html/rfc7231#section-6.4.3
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=POST',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, authCheck1]],
// GET method must be used for 303 redirect.
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=POST&Status=303',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, authCheck1]],
// The 307 redirect response doesn't change the method.
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=POST&Status=307',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsPOST, authCheck1]],
// The 308 redirect response doesn't change the method.
// FIXME: currently this and following 308 tests are disabled because they
@@ -61,17 +67,19 @@ var TEST_TARGETS = [
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&credentials=same-origin&method=POST&Status=201&' +
'NoRedirectTest=true',
- [fetchResolved, hasBody, typeBasic],
+ [fetchResolved, hasBody, typeBasic, checkURLList.bind(self, [])],
[checkJsonpNoRedirect]],
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&credentials=same-origin&method=PUT',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsPUT, authCheck1]],
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic,
+ checkURLList.bind(self, [BASE_URL])],
[methodIsGET, hasCustomHeader, authCheck1]],
// Redirect: same origin -> other origin
@@ -94,7 +102,8 @@ var TEST_TARGETS = [
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*'])],
[methodIsGET, authCheckNone]],
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=PUT',
@@ -102,29 +111,34 @@ var TEST_TARGETS = [
[REDIRECT_URL +
encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*&ACAMethods=PUT') +
'&mode=cors&credentials=same-origin&method=PUT',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*&ACAMethods=PUT'])],
[methodIsPUT, noCustomHeader, authCheckNone]],
// Status code tests for mode="cors"
// The 301 redirect response MAY change the request method from POST to GET.
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&Status=301',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*'])],
[methodIsGET]],
// The 302 redirect response MAY change the request method from POST to GET.
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&Status=302',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*'])],
[methodIsGET]],
// GET method must be used for 303 redirect.
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&Status=303',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*'])],
[methodIsGET]],
// The 307 redirect response MUST NOT change the method.
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&Status=307',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + '&ACAOrigin=*'])],
[methodIsPOST]],
// The 308 redirect response MUST NOT change the method.
// FIXME: disabled due to https://crbug.com/451938
@@ -139,18 +153,17 @@ var TEST_TARGETS = [
OTHER_BASE_URL +
'ACAOrigin=*&ACAHeaders=x-serviceworker-test') +
'&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(
+ self,
+ [OTHER_BASE_URL + 'ACAOrigin=*&ACAHeaders=x-serviceworker-test'])],
[methodIsGET, hasCustomHeader, authCheckNone]],
[REDIRECT_URL +
- encodeURIComponent(
- OTHER_BASE_URL +
- 'ACAOrigin=*') +
+ encodeURIComponent(OTHER_BASE_URL +'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM',
[fetchRejected]],
[REDIRECT_URL +
- encodeURIComponent(
- OTHER_BASE_URL +
- 'ACAHeaders=x-serviceworker-test') +
+ encodeURIComponent(OTHER_BASE_URL + 'ACAHeaders=x-serviceworker-test') +
'&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM',
[fetchRejected]],
@@ -161,7 +174,11 @@ var TEST_TARGETS = [
'&ACAOrigin=' + BASE_ORIGIN +
'&ACEHeaders=Content-Length, X-ServiceWorker-ServerHeader') +
'&mode=cors&credentials=same-origin&method=GET',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeCors],
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeCors,
+ checkURLList.bind(
+ self,
+ [OTHER_BASE_URL +'&ACAOrigin=' + BASE_ORIGIN +
+ '&ACEHeaders=Content-Length,%20X-ServiceWorker-ServerHeader'])],
[methodIsGET, authCheckNone]],
// Redirect: other origin -> same origin
@@ -180,29 +197,34 @@ var TEST_TARGETS = [
[fetchRejected]],
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [BASE_URL + 'ACAOrigin=*'])],
[methodIsGET, authCheckNone]],
// Status code tests for mode="cors"
// The 301 redirect response MAY change the request method from POST to GET.
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=post&ACAOrigin=*&Status=301',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// The 302 redirect response MAY change the request method from POST to GET.
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=post&ACAOrigin=*&Status=302',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// GET method must be used for 303 redirect.
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=post&ACAOrigin=*&Status=303',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// The 307 redirect response MUST NOT change the method.
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=post&ACAOrigin=*&Status=307',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [BASE_URL + 'ACAOrigin=*'])],
[methodIsPOST]],
// The 308 redirect response MUST NOT change the method.
// FIXME: disabled due to https://crbug.com/451938
@@ -239,45 +261,53 @@ var TEST_TARGETS = [
[fetchRejected]],
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsGET, authCheckNone]],
[OTHER_REDIRECT_URL +
encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN + '') +
'&mode=cors&credentials=same-origin&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN])],
[methodIsGET, authCheckNone]],
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=GET' +
'&ACAOrigin=' + BASE_ORIGIN + '',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsGET, authCheckNone]],
[OTHER_REDIRECT_URL +
encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN + '') +
'&mode=cors&credentials=same-origin&method=GET' +
'&ACAOrigin=' + BASE_ORIGIN + '',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN])],
[methodIsGET, authCheckNone]],
// Status code tests for mode="cors"
// The 301 redirect response MAY change the request method from POST to GET.
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&ACAOrigin=*&Status=301',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// The 302 redirect response MAY change the request method from POST to GET.
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&ACAOrigin=*&Status=302',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// GET method must be used for 303 redirect.
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&ACAOrigin=*&Status=303',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsGET]],
// The 307 redirect response MUST NOT change the method.
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
'&mode=cors&credentials=same-origin&method=POST&ACAOrigin=*&Status=307',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors,
+ checkURLList.bind(self, [OTHER_BASE_URL + 'ACAOrigin=*'])],
[methodIsPOST]],
// The 308 redirect response MUST NOT change the method.
// FIXME: disabled due to https://crbug.com/451938
@@ -291,7 +321,11 @@ var TEST_TARGETS = [
encodeURIComponent(OTHER_BASE_URL +
'ACAOrigin=*&ACEHeaders=X-ServiceWorker-ServerHeader') +
'&mode=cors&credentials=same-origin&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, hasServerHeader, hasBody, typeCors],
+ [fetchResolved, noContentLength, hasServerHeader, hasBody, typeCors,
+ checkURLList.bind(
+ self,
+ [OTHER_BASE_URL +
+ 'ACAOrigin=*&ACEHeaders=X-ServiceWorker-ServerHeader'])],
[methodIsGET, authCheckNone]],
// Custom method
« third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/response.js ('K') | « third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/response.js ('k') | third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-loop.js » ('j') | third_party/WebKit/LayoutTests/http/tests/serviceworker/redirected-response.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698