| Index: LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js
|
| diff --git a/LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js b/LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js
|
| deleted file mode 100644
|
| index 7b9b486654c833be20b0e42d10aff0945caa86de..0000000000000000000000000000000000000000
|
| --- a/LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js
|
| +++ /dev/null
|
| @@ -1,292 +0,0 @@
|
| -if (self.importScripts) {
|
| - importScripts('../resources/fetch-test-helpers.js');
|
| - importScripts('../resources/fetch-access-control-util.js');
|
| -}
|
| -
|
| -var TEST_TARGETS = [
|
| - // Redirect: same origin -> same origin
|
| - [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=GET',
|
| - [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
|
| - [methodIsGET, authCheck1]],
|
| -
|
| - // https://fetch.spec.whatwg.org/#concept-http-fetch
|
| - // Step 4, Case 301/302/303/307/308:
|
| - // Step 2: If location is null, return response.
|
| - [REDIRECT_URL + 'noLocation' +
|
| - '&mode=same-origin&method=GET&NoRedirectTest=true',
|
| - [fetchResolved, hasBody, typeBasic],
|
| - [checkJsonpNoRedirect]],
|
| - // Step 5: If locationURL is failure, return a network error.
|
| - [REDIRECT_URL + 'http://' +
|
| - '&mode=same-origin&method=GET',
|
| - [fetchRejected]],
|
| -
|
| - [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=GET&headers=CUSTOM',
|
| - [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
|
| - [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],
|
| - [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],
|
| - [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],
|
| - [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],
|
| - [methodIsPOST, authCheck1]],
|
| - // The 308 redirect response doesn't change the method.
|
| - // FIXME: currently this and following 308 tests are disabled because they
|
| - // fail on try bots, probably due to Apache/PHP versions.
|
| - // https://crbug.com/451938
|
| - // [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - // '&mode=same-origin&method=POST&Status=308',
|
| - // [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
|
| - // [methodIsPOST, authCheck1]],
|
| -
|
| - // Do not redirect for other status even if Location header exists.
|
| - [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=POST&Status=201&NoRedirectTest=true',
|
| - [fetchResolved, hasBody, typeBasic],
|
| - [checkJsonpNoRedirect]],
|
| -
|
| - [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=PUT',
|
| - [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
|
| - [methodIsPUT, authCheck1]],
|
| -
|
| - [REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=cors&method=GET&headers=CUSTOM',
|
| - [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
|
| - [methodIsGET, hasCustomHeader, authCheck1]],
|
| -
|
| - // Redirect: same origin -> other origin
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=same-origin&method=GET',
|
| - [fetchRejected]],
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=same-origin&method=POST',
|
| - [fetchRejected]],
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=same-origin&method=PUT',
|
| - [fetchRejected]],
|
| -
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=cors&method=GET',
|
| - [fetchRejected]],
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=cors&method=PUT',
|
| - [fetchRejected]],
|
| -
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - '&mode=cors&method=GET',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - '&mode=cors&method=PUT',
|
| - [fetchRejected]],
|
| - [REDIRECT_URL +
|
| - encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*&ACAMethods=PUT') +
|
| - '&mode=cors&method=PUT',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [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&method=POST&Status=301',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 302 redirect response MAY change the request method from POST to GET.
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - '&mode=cors&method=POST&Status=302',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // GET method must be used for 303 redirect.
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - '&mode=cors&method=POST&Status=303',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 307 redirect response MUST NOT change the method.
|
| - [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - '&mode=cors&method=POST&Status=307',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsPOST]],
|
| - // The 308 redirect response MUST NOT change the method.
|
| - // FIXME: disabled due to https://crbug.com/451938
|
| - // [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
|
| - // '&mode=cors&method=POST&Status=308',
|
| - // [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - // [methodIsPOST]],
|
| -
|
| - // Server header
|
| - [REDIRECT_URL +
|
| - encodeURIComponent(
|
| - OTHER_BASE_URL +
|
| - '&ACAOrigin=' + BASE_ORIGIN +
|
| - '&ACEHeaders=Content-Length, X-ServiceWorker-ServerHeader') +
|
| - '&mode=cors&method=GET',
|
| - [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| -
|
| - // Redirect: other origin -> same origin
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=GET',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=same-origin&method=POST',
|
| - [fetchRejected]],
|
| -
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=cors&method=GET',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [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&method=post&ACAOrigin=*&Status=301',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 302 redirect response MAY change the request method from POST to GET.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=post&ACAOrigin=*&Status=302',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // GET method must be used for 303 redirect.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=post&ACAOrigin=*&Status=303',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 307 redirect response MUST NOT change the method.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=post&ACAOrigin=*&Status=307',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsPOST]],
|
| - // The 308 redirect response MUST NOT change the method.
|
| - // FIXME: disabled due to https://crbug.com/451938
|
| - // [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
|
| - // '&mode=cors&method=post&ACAOrigin=*&Status=308',
|
| - // [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - // [methodIsPOST]],
|
| -
|
| - // Once CORS preflight flag is set, redirecting to the cross-origin is not
|
| - // allowed.
|
| - // Custom method
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') +
|
| - '&mode=cors&method=PUT&ACAOrigin=*&ACAMethods=PUT',
|
| - [fetchRejected]],
|
| - // Custom header
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(
|
| - BASE_URL +
|
| - 'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') +
|
| - '&mode=cors&method=GET&headers=CUSTOM&ACAOrigin=*',
|
| - [fetchRejected]],
|
| -
|
| - // Redirect: other origin -> other origin
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=same-origin&method=GET',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=cors&method=GET',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchRejected]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN + '') +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=GET&ACAOrigin=' + BASE_ORIGIN + '',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=' + BASE_ORIGIN + '') +
|
| - '&mode=cors&method=GET&ACAOrigin=' + BASE_ORIGIN + '',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [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&method=POST&ACAOrigin=*&Status=301',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 302 redirect response MAY change the request method from POST to GET.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=POST&ACAOrigin=*&Status=302',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // GET method must be used for 303 redirect.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=POST&ACAOrigin=*&Status=303',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsGET]],
|
| - // The 307 redirect response MUST NOT change the method.
|
| - [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - '&mode=cors&method=POST&ACAOrigin=*&Status=307',
|
| - [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - [methodIsPOST]],
|
| - // The 308 redirect response MUST NOT change the method.
|
| - // FIXME: disabled due to https://crbug.com/451938
|
| - // [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
|
| - // '&mode=cors&method=POST&ACAOrigin=*&Status=308',
|
| - // [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
|
| - // [methodIsPOST]],
|
| -
|
| - // Server header
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(OTHER_BASE_URL +
|
| - 'ACAOrigin=*&ACEHeaders=X-ServiceWorker-ServerHeader') +
|
| - '&mode=cors&method=GET&ACAOrigin=*',
|
| - [fetchResolved, noContentLength, hasServerHeader, hasBody, typeCors],
|
| - [methodIsGET, authCheckNone]],
|
| -
|
| - // Once CORS preflight flag is set, redirecting to the cross-origin is not
|
| - // allowed.
|
| - // Custom method
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') +
|
| - '&mode=cors&method=PUT&ACAOrigin=*&ACAMethods=PUT',
|
| - [fetchRejected]],
|
| - // Custom header
|
| - [OTHER_REDIRECT_URL +
|
| - encodeURIComponent(
|
| - OTHER_BASE_URL +
|
| - 'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') +
|
| - '&mode=cors&method=GET&headers=CUSTOM' +
|
| - '&ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test',
|
| - [fetchRejected]],
|
| -];
|
| -
|
| -if (self.importScripts) {
|
| - executeTests(TEST_TARGETS);
|
| - done();
|
| -}
|
|
|