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 7f33e95b817d440bddb5505df85ce0ef1982c2ce..3918b947ba2e00ea6bc4e6ddbea11f7f6c3d4238 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 |
@@ -190,20 +190,20 @@ var TEST_TARGETS = [ |
// [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors], |
// [methodIsPOST]], |
- // Once CORS preflight flag is set, redirecting to the cross-origin is not |
- // allowed. |
- // Custom method |
yhirano
2016/11/22 04:05:23
Should this line remain?
Jack Bates
2016/11/22 18:24:17
Done.
|
[OTHER_REDIRECT_URL + |
encodeURIComponent(BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') + |
'&mode=cors&credentials=same-origin&method=PUT&ACAOrigin=*&ACAMethods=PUT', |
- [fetchRejected]], |
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors], |
+ [methodIsPUT, authCheckNone]], |
// Custom header |
[OTHER_REDIRECT_URL + |
encodeURIComponent( |
BASE_URL + |
- 'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') + |
- '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM&ACAOrigin=*', |
- [fetchRejected]], |
+ 'ACAOrigin=*&ACAHeaders=x-serviceworker-test') + |
+ '&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM' + |
+ '&ACAOrigin=*&ACAHeaders=x-serviceworker-test', |
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors], |
+ [methodIsGET, hasCustomHeader, authCheckNone]], |
// Redirect: other origin -> other origin |
[OTHER_REDIRECT_URL + encodeURIComponent(OTHER_BASE_URL) + |
@@ -272,13 +272,11 @@ var TEST_TARGETS = [ |
[fetchResolved, noContentLength, hasServerHeader, hasBody, typeCors], |
[methodIsGET, authCheckNone]], |
- // Once CORS preflight flag is set, redirecting to the cross-origin is not |
- // allowed. |
- // Custom method |
yhirano
2016/11/22 04:05:23
ditto
Jack Bates
2016/11/22 18:24:17
Done.
|
[OTHER_REDIRECT_URL + |
encodeURIComponent(OTHER_BASE_URL + 'ACAOrigin=*&ACAMethods=PUT') + |
'&mode=cors&credentials=same-origin&method=PUT&ACAOrigin=*&ACAMethods=PUT', |
- [fetchRejected]], |
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors], |
+ [methodIsPUT, authCheckNone]], |
// Custom header |
[OTHER_REDIRECT_URL + |
encodeURIComponent( |
@@ -286,7 +284,8 @@ var TEST_TARGETS = [ |
'ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test') + |
'&mode=cors&credentials=same-origin&method=GET&headers=CUSTOM' + |
'&ACAOrigin=' + BASE_ORIGIN + '&ACAHeaders=x-serviceworker-test', |
- [fetchRejected]], |
+ [fetchResolved, noContentLength, noServerHeader, hasBody, typeCors], |
+ [methodIsGET, hasCustomHeader, authCheckNone]], |
]; |
if (self.importScripts) { |