From c7752bab63fc126c78c515512aecc0d66b68d6ca Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 18 Dec 2015 10:07:42 -0500 Subject: [PATCH] Enable cors/ directory for WPT. --- tests/wpt/include.ini | 2 +- tests/wpt/metadata/cors/allow-headers.htm.ini | 15 ++ tests/wpt/metadata/cors/basic.htm.ini | 12 ++ .../metadata/cors/credentials-flag.htm.ini | 9 ++ tests/wpt/metadata/cors/origin.htm.ini | 21 +++ .../wpt/metadata/cors/redirect-origin.htm.ini | 54 +++++++ .../cors/redirect-preflight-2.htm.ini | 3 + tests/wpt/metadata/cors/remote-origin.htm.ini | 136 +++++++++++++++++- .../metadata/cors/response-headers.htm.ini | 14 ++ .../wpt/metadata/cors/simple-requests.htm.ini | 74 ---------- 10 files changed, 264 insertions(+), 76 deletions(-) create mode 100644 tests/wpt/metadata/cors/response-headers.htm.ini delete mode 100644 tests/wpt/metadata/cors/simple-requests.htm.ini diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index 7621aa54e2a..c11ad9d27c0 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -30,7 +30,7 @@ skip: true [script_scheduling] skip: false [cors] - skip: true + skip: false [webgl] skip: false [webstorage] diff --git a/tests/wpt/metadata/cors/allow-headers.htm.ini b/tests/wpt/metadata/cors/allow-headers.htm.ini index 338f4dbbe81..07bd1905cc5 100644 --- a/tests/wpt/metadata/cors/allow-headers.htm.ini +++ b/tests/wpt/metadata/cors/allow-headers.htm.ini @@ -21,3 +21,18 @@ [Allow origin: [tab\]undefined//undefined] expected: FAIL + [Allow origin: http://web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://web-platform.test:8000___[tab\]_] + expected: FAIL + + [Allow origin: [tab\]http://web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://web-platform.test:8000/] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/basic.htm.ini b/tests/wpt/metadata/cors/basic.htm.ini index 21c462766aa..6b8c71e2f21 100644 --- a/tests/wpt/metadata/cors/basic.htm.ini +++ b/tests/wpt/metadata/cors/basic.htm.ini @@ -3,3 +3,15 @@ [Cross domain basic usage] expected: FAIL + [Same domain different port] + expected: FAIL + + [Cross domain different port] + expected: FAIL + + [Cross domain different protocol] + expected: FAIL + + [Same domain different protocol different port] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/credentials-flag.htm.ini b/tests/wpt/metadata/cors/credentials-flag.htm.ini index 73ff35ab17c..7c356c2eecc 100644 --- a/tests/wpt/metadata/cors/credentials-flag.htm.ini +++ b/tests/wpt/metadata/cors/credentials-flag.htm.ini @@ -1,3 +1,12 @@ [credentials-flag.htm] type: testharness expected: TIMEOUT + [Don't send cookie by default] + expected: TIMEOUT + + [Don't send cookie part 2] + expected: TIMEOUT + + [Don't obey Set-Cookie when withCredentials=false] + expected: TIMEOUT + diff --git a/tests/wpt/metadata/cors/origin.htm.ini b/tests/wpt/metadata/cors/origin.htm.ini index f22e263fbb2..84071a32cfa 100644 --- a/tests/wpt/metadata/cors/origin.htm.ini +++ b/tests/wpt/metadata/cors/origin.htm.ini @@ -21,3 +21,24 @@ [Allow origin: [tab\]undefined//undefined] expected: FAIL + [Allow origin: http://web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://web-platform.test:8000___[tab\]_] + expected: FAIL + + [Allow origin: [tab\]http://web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://web-platform.test:8000/] + expected: FAIL + + [Disallow multiple headers (, *)] + expected: FAIL + + [Disallow multiple headers (*, )] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/redirect-origin.htm.ini b/tests/wpt/metadata/cors/redirect-origin.htm.ini index a25f2bb4f4d..6559255c508 100644 --- a/tests/wpt/metadata/cors/redirect-origin.htm.ini +++ b/tests/wpt/metadata/cors/redirect-origin.htm.ini @@ -54,3 +54,57 @@ [remote (undefined//undefined) to remote2 (null), expect origin=null] expected: FAIL + [local (*) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [local (*) to remote (http://web-platform.test:8000), expect origin=http://web-platform.test:8000] + expected: FAIL + + [local (*) to remote (null), expect to fail] + expected: FAIL + + [local (*) to remote (none), expect to fail] + expected: FAIL + + [local (http://web-platform.test:8000) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [local (http://web-platform.test:8000) to remote (http://web-platform.test:8000), expect origin=http://web-platform.test:8000] + expected: FAIL + + [local (http://web-platform.test:8000) to remote (null), expect to fail] + expected: FAIL + + [local (http://web-platform.test:8000) to remote (none), expect to fail] + expected: FAIL + + [local (null) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [local (none) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [remote (http://web-platform.test:8000) to local (*), expect origin=null] + expected: FAIL + + [remote (http://web-platform.test:8000) to local (null), expect origin=null] + expected: FAIL + + [remote (*) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [remote (*) to remote (http://web-platform.test:8000), expect origin=http://web-platform.test:8000] + expected: FAIL + + [remote (http://web-platform.test:8000) to remote (*), expect origin=http://web-platform.test:8000] + expected: FAIL + + [remote (http://web-platform.test:8000) to remote (http://web-platform.test:8000), expect origin=http://web-platform.test:8000] + expected: FAIL + + [remote (http://web-platform.test:8000) to remote2 (*), expect origin=null] + expected: FAIL + + [remote (http://web-platform.test:8000) to remote2 (null), expect origin=null] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini b/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini index 21e4a65c0a5..3db95f5aa7e 100644 --- a/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini +++ b/tests/wpt/metadata/cors/redirect-preflight-2.htm.ini @@ -3,3 +3,6 @@ [Same-origin custom-header request, redirect to cross-origin succeeds after doing a preflight] expected: FAIL + [Same-origin custom-header request, redirect to cross-origin fails after doing a non-successful preflight] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/remote-origin.htm.ini b/tests/wpt/metadata/cors/remote-origin.htm.ini index 2d9f7dcbcd2..57a120246c1 100644 --- a/tests/wpt/metadata/cors/remote-origin.htm.ini +++ b/tests/wpt/metadata/cors/remote-origin.htm.ini @@ -1,3 +1,137 @@ [remote-origin.htm] type: testharness - expected: CRASH + [Allow origin: *] + expected: FAIL + + [Allow origin: _*__] + expected: FAIL + + [Allow origin: [tab\]*] + expected: FAIL + + [Allow origin: http://www1.web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://www1.web-platform.test:8000] + expected: FAIL + + [Allow origin: _http://www1.web-platform.test:8000___[tab\]_] + expected: FAIL + + [Allow origin: [tab\]http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://web-platform.test:8000] + expected: FAIL + + [Disallow origin: //www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: ://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: ftp://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http:://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http:/www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http:www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000?] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000/] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000_/] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000#] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000%23] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000:80] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000,_*] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000\\0] + expected: FAIL + + [Disallow origin: HTTP://WWW1.WEB-PLATFORM.TEST:8000] + expected: FAIL + + [Disallow origin: HTTP://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://WWW1.WEB-PLATFORM.TEST:8000] + expected: FAIL + + [Disallow origin: -] + expected: FAIL + + [Disallow origin: **] + expected: FAIL + + [Disallow origin: \\0*] + expected: FAIL + + [Disallow origin: *\\0] + expected: FAIL + + [Disallow origin: '*'] + expected: FAIL + + [Disallow origin: "*"] + expected: FAIL + + [Disallow origin: *_*] + expected: FAIL + + [Disallow origin: *http://*] + expected: FAIL + + [Disallow origin: *http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: *_http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: *,_http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: \\0http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: null_http://www1.web-platform.test:8000] + expected: FAIL + + [Disallow origin: http://example.net] + expected: FAIL + + [Disallow origin: null] + expected: FAIL + + [Disallow origin: ] + expected: FAIL + + [Disallow origin: http://web-platform.test:8000/cors/remote-origin.htm] + expected: FAIL + + [Disallow origin: http://web-platform.test:8000/cors/] + expected: FAIL + + [Disallow origin: http://www1.web-platform.test:8000/cors/] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/response-headers.htm.ini b/tests/wpt/metadata/cors/response-headers.htm.ini new file mode 100644 index 00000000000..15d1c72e334 --- /dev/null +++ b/tests/wpt/metadata/cors/response-headers.htm.ini @@ -0,0 +1,14 @@ +[response-headers.htm] + type: testharness + [getResponseHeader: Expose Access-Control-Expose-Headers (x-custom-header-comma)] + expected: FAIL + + [getResponseHeader: Combined testing of cors response headers] + expected: FAIL + + [getResponse: don't expose x-nonexposed] + expected: FAIL + + [getAllResponseHeaders: don't expose x-nonexposed] + expected: FAIL + diff --git a/tests/wpt/metadata/cors/simple-requests.htm.ini b/tests/wpt/metadata/cors/simple-requests.htm.ini deleted file mode 100644 index a77dd4d5c58..00000000000 --- a/tests/wpt/metadata/cors/simple-requests.htm.ini +++ /dev/null @@ -1,74 +0,0 @@ -[simple-requests.htm] - type: testharness - [No preflight GET and {"Accept":"test"}] - expected: FAIL - - [No preflight HEAD and {"Accept":"test"}] - expected: FAIL - - [No preflight POST and {"Accept":"test"}] - expected: FAIL - - [No preflight GET and {"accept-language":"test"}] - expected: FAIL - - [No preflight HEAD and {"accept-language":"test"}] - expected: FAIL - - [No preflight POST and {"accept-language":"test"}] - expected: FAIL - - [No preflight GET and {"CONTENT-language":"test"}] - expected: FAIL - - [No preflight HEAD and {"CONTENT-language":"test"}] - expected: FAIL - - [No preflight POST and {"CONTENT-language":"test"}] - expected: FAIL - - [No preflight GET and {"Content-Type":"application/x-www-form-urlencoded"}] - expected: FAIL - - [No preflight HEAD and {"Content-Type":"application/x-www-form-urlencoded"}] - expected: FAIL - - [No preflight POST and {"Content-Type":"application/x-www-form-urlencoded"}] - expected: FAIL - - [No preflight GET and {"content-type":"multipart/form-data"}] - expected: FAIL - - [No preflight HEAD and {"content-type":"multipart/form-data"}] - expected: FAIL - - [No preflight POST and {"content-type":"multipart/form-data"}] - expected: FAIL - - [No preflight GET and {"content-type":"text/plain"}] - expected: FAIL - - [No preflight HEAD and {"content-type":"text/plain"}] - expected: FAIL - - [No preflight POST and {"content-type":"text/plain"}] - expected: FAIL - - [No preflight GET and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] - expected: FAIL - - [No preflight HEAD and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] - expected: FAIL - - [No preflight POST and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}] - expected: FAIL - - [No preflight Get and {"content-type":"text/plain; parameter=extra_bonus"}] - expected: FAIL - - [No preflight post and {"content-type":"text/plain"}] - expected: FAIL - - [Check simple headers (async)] - expected: FAIL -