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

Unified Diff: LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js

Issue 921673003: [Fetch] Split layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 months 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
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
index 117fc423d48136a63b21c599c9d29058d63e8ecf..596437fdf801356e8dc33634f88c2dcb9736c03b 100644
--- a/LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js
+++ b/LayoutTests/http/tests/fetch/script-tests/fetch-access-control-redirect.js
@@ -69,29 +69,10 @@ var TEST_TARGETS = [
[methodIsPUT, authCheck1]],
[REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=GET&headers=CUSTOM',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
- [methodIsGET, noCustomHeader, authCheck1]],
-
- [REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=cors&method=GET&headers=CUSTOM',
[fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
[methodIsGET, hasCustomHeader, authCheck1]],
- // Credential test
- [REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=cors&credentials=omit&method=GET',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
- [methodIsGET, authCheckNone]],
- [REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=cors&credentials=include&method=GET',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
- [methodIsGET, authCheck1]],
- [REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=cors&credentials=same-origin&method=GET',
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic],
- [methodIsGET, authCheck1]],
-
// Redirect: same origin -> other origin
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
'&mode=same-origin&method=GET',
@@ -104,39 +85,6 @@ var TEST_TARGETS = [
[fetchRejected]],
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=no-cors&method=GET&headers=CUSTOM',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, noCustomHeader, authCheck2])],
-
- // Status code tests for mode="no-cors"
- // The 301 redirect response changes POST method to GET method.
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=no-cors&method=POST&Status=301',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck2])],
- // The 302 redirect response changes POST method to GET method.
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=no-cors&method=POST',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck2])],
- // GET method must be used for 303 redirect.
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=no-cors&method=POST&Status=303',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck2])],
- // The 307 redirect response doesn't change the method.
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=no-cors&method=POST&Status=307',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsPOST, authCheck2])],
- // The 308 redirect response doesn't change the method.
- // FIXME: disabled due to https://crbug.com/451938
- // [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- // '&mode=no-cors&method=POST&Status=308',
- // [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- // onlyOnServiceWorkerProxiedTest([methodIsPOST, authCheck2])],
-
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
'&mode=cors&method=GET',
[fetchRejected]],
[REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
@@ -194,52 +142,6 @@ var TEST_TARGETS = [
[fetchResolved, hasContentLength, hasServerHeader, hasBody, typeCors],
[methodIsGET, authCheckNone]],
- // Credential test
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=cors&credentials=omit&method=GET',
- [fetchRejected]],
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=cors&credentials=include&method=GET',
- [fetchRejected]],
- [REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
- '&mode=cors&credentials=same-origin&method=GET',
- [fetchRejected]],
-
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=' + BASE_ORIGIN + '') +
- '&mode=cors&credentials=omit&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true') +
- '&mode=cors&credentials=omit&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
-
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=' + BASE_ORIGIN + '') +
- '&mode=cors&credentials=include&method=GET',
- [fetchRejected]],
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true') +
- '&mode=cors&credentials=include&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheck2]],
-
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=' + BASE_ORIGIN + '') +
- '&mode=cors&credentials=same-origin&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [REDIRECT_URL +
- encodeURIComponent(OTHER_BASE_URL +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true') +
- '&mode=cors&credentials=same-origin&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
-
// Redirect: other origin -> same origin
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=same-origin&method=GET',
@@ -249,43 +151,6 @@ var TEST_TARGETS = [
[fetchRejected]],
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=GET',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck1])],
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=GET&headers=CUSTOM',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, noCustomHeader, authCheck1])],
-
- // Status code tests for mode="no-cors"
- // The 301 redirect response MAY change the request method from POST to GET.
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=POST&Status=301',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck1])],
- // The 302 redirect response MAY change the request method from POST to GET.
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=POST',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck1])],
- // GET method must be used for 303 redirect.
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=POST&Status=303',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck1])],
- // The 307 redirect response MUST NOT change the method.
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- '&mode=no-cors&method=POST&Status=307',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsPOST, authCheck1])],
- // The 308 redirect response MUST NOT change the method.
- // FIXME: disabled due to https://crbug.com/451938
- // [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
- // '&mode=no-cors&method=POST&Status=308',
- // [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- // onlyOnServiceWorkerProxiedTest([methodIsPOST, authCheck1])],
-
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
'&mode=cors&method=GET',
[fetchRejected]],
[OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL) +
@@ -339,46 +204,11 @@ var TEST_TARGETS = [
'&mode=cors&method=GET&headers=CUSTOM&ACAOrigin=*',
[fetchRejected]],
- // Credentials test
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
- '&mode=cors&credentials=omit&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
- '&mode=cors&credentials=include&method=GET&ACAOrigin=*',
- [fetchRejected]],
- [OTHER_REDIRECT_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
- '&mode=cors&credentials=same-origin&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [OTHER_REDIRECT_URL +
- encodeURIComponent(BASE_URL + 'ACAOrigin=null&ACACredentials=true') +
- '&mode=cors&credentials=omit&method=GET' +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [OTHER_REDIRECT_URL +
- encodeURIComponent(BASE_URL + 'ACAOrigin=null&ACACredentials=true') +
- '&mode=cors&credentials=include&method=GET' +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheck1]],
- [OTHER_REDIRECT_URL +
- encodeURIComponent(BASE_URL + 'ACAOrigin=null&ACACredentials=true') +
- '&mode=cors&credentials=same-origin&method=GET' +
- '&ACAOrigin=' + BASE_ORIGIN + '&ACACredentials=true',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
-
// 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=no-cors&method=GET',
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque],
- onlyOnServiceWorkerProxiedTest([methodIsGET, authCheck2])],
- [OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
'&mode=cors&method=GET',
[fetchRejected]],
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) +
@@ -403,7 +233,6 @@ var TEST_TARGETS = [
[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=*') +
@@ -455,45 +284,6 @@ var TEST_TARGETS = [
'&mode=cors&method=GET&headers=CUSTOM' +
'&ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test',
[fetchRejected]],
-
- // Redirect loop: same origin -> same origin
- [REDIRECT_LOOP_URL + encodeURIComponent(BASE_URL) + '&Count=20',
- [fetchResolved, hasContentLength, hasBody, typeBasic],
- [methodIsGET, authCheck1]],
- [REDIRECT_LOOP_URL + encodeURIComponent(BASE_URL) + '&Count=21',
- [fetchRejected]],
-
- // Redirect loop: same origin -> other origin
- [REDIRECT_LOOP_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
- '&Count=20&mode=cors&method=GET',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- // FIXME: due to the current implementation of Chromium,
- // Count=21 is resolved, Count=22 is rejected.
- // https://crbug.com/353768
- [REDIRECT_LOOP_URL + encodeURIComponent(OTHER_BASE_URL + '&ACAOrigin=*') +
- '&Count=22&mode=cors&method=GET',
- [fetchRejected]],
-
- // Redirect loop: other origin -> same origin
- [OTHER_REDIRECT_LOOP_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
- '&Count=20&mode=cors&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [OTHER_REDIRECT_LOOP_URL + encodeURIComponent(BASE_URL + 'ACAOrigin=*') +
- '&Count=21&mode=cors&method=GET&ACAOrigin=*',
- [fetchRejected]],
-
- // Redirect loop: other origin -> other origin
- [OTHER_REDIRECT_LOOP_URL +
- encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
- '&Count=20&mode=cors&method=GET&ACAOrigin=*',
- [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors],
- [methodIsGET, authCheckNone]],
- [OTHER_REDIRECT_LOOP_URL +
- encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*') +
- '&Count=21&mode=cors&method=GET&ACAOrigin=*',
- [fetchRejected]],
];
if (self.importScripts) {

Powered by Google App Engine
This is Rietveld 408576698