Re-sync web-platform-tests/xhr from upstream
authorpsaavedra@igalia.com <psaavedra@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Jan 2020 21:58:34 +0000 (21:58 +0000)
committerpsaavedra@igalia.com <psaavedra@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Jan 2020 21:58:34 +0000 (21:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=205641

Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

* web-platform-tests/xhr/FormData-append-expected.txt:
* web-platform-tests/xhr/FormData-append.html:
* web-platform-tests/xhr/META.yml:
* web-platform-tests/xhr/abort-after-receive.htm: Removed.
* web-platform-tests/xhr/abort-after-send.htm: Removed.
* web-platform-tests/xhr/abort-after-stop.htm: Removed.
* web-platform-tests/xhr/abort-after-timeout.htm: Removed.
* web-platform-tests/xhr/abort-during-done.htm: Removed.
* web-platform-tests/xhr/abort-during-headers-received.htm: Removed.
* web-platform-tests/xhr/abort-during-loading.htm: Removed.
* web-platform-tests/xhr/abort-during-unsent.htm: Removed.
* web-platform-tests/xhr/abort-during-upload.htm: Removed.
* web-platform-tests/xhr/abort-event-abort.htm: Removed.
* web-platform-tests/xhr/abort-event-listeners.htm: Removed.
* web-platform-tests/xhr/abort-event-loadend.htm: Removed.
* web-platform-tests/xhr/abort-upload-event-abort.htm: Removed.
* web-platform-tests/xhr/abort-upload-event-loadend.htm: Removed.
* web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm: Removed.
* web-platform-tests/xhr/access-control-and-redirects-async.htm: Removed.
* web-platform-tests/xhr/access-control-and-redirects.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-async.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow-star.htm: Removed.
* web-platform-tests/xhr/access-control-basic-allow.htm: Removed.
* web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt:
* web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm:
* web-platform-tests/xhr/event-abort.htm: Removed.
* web-platform-tests/xhr/event-error.sub.html: Removed.
* web-platform-tests/xhr/event-load.htm: Removed.
* web-platform-tests/xhr/event-loadend.htm: Removed.
* web-platform-tests/xhr/event-loadstart-upload.htm: Removed.
* web-platform-tests/xhr/event-loadstart.htm: Removed.
* web-platform-tests/xhr/event-progress.htm: Removed.
* web-platform-tests/xhr/event-readystate-sync-open.htm: Removed.
* web-platform-tests/xhr/event-readystatechange-loaded.htm: Removed.
* web-platform-tests/xhr/event-timeout-order.htm: Removed.
* web-platform-tests/xhr/event-timeout.htm: Removed.
* web-platform-tests/xhr/event-upload-progress-crossorigin.htm: Removed.
* web-platform-tests/xhr/event-upload-progress.htm: Removed.
* web-platform-tests/xhr/formdata-expected.txt:
* web-platform-tests/xhr/formdata-set-expected.txt:
* web-platform-tests/xhr/formdata-set.htm:
* web-platform-tests/xhr/formdata.htm:
* web-platform-tests/xhr/getallresponseheaders-expected.txt:
* web-platform-tests/xhr/getallresponseheaders.htm:
* web-platform-tests/xhr/idlharness.any.js:
* web-platform-tests/xhr/open-during-abort-processing-expected.txt:
* web-platform-tests/xhr/open-during-abort-processing.htm:
* web-platform-tests/xhr/overridemimetype-blob.html:
* web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm: Removed.
* web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py:
(main):
* web-platform-tests/xhr/resources/authentication.py:
(main):
* web-platform-tests/xhr/resources/echo-method.py:
(main):
* web-platform-tests/xhr/resources/headers.asis:
* web-platform-tests/xhr/response-data-progress.htm:
* web-platform-tests/xhr/responsexml-document-properties-expected.txt:
* web-platform-tests/xhr/responsexml-document-properties.htm:
* web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt:
* web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm:
* web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm:
* web-platform-tests/xhr/send-content-type-charset.htm:
* web-platform-tests/xhr/send-data-arraybuffer.htm: Removed.
* web-platform-tests/xhr/send-data-arraybufferview.htm: Removed.
* web-platform-tests/xhr/send-data-es-object.htm: Removed.
* web-platform-tests/xhr/send-data-formdata.htm: Removed.
* web-platform-tests/xhr/send-redirect-bogus-sync-expected.txt:
* web-platform-tests/xhr/send-redirect-bogus-sync.htm:
* web-platform-tests/xhr/send-redirect-bogus.htm:
* web-platform-tests/xhr/send-redirect-post-upload.htm:
* web-platform-tests/xhr/setrequestheader-content-type.htm:
* web-platform-tests/xhr/sync-no-progress.any.js:
* web-platform-tests/xhr/timeout-cors-async.htm:
* web-platform-tests/xhr/w3c-import.log:

LayoutTests:

* TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator-wk2/TestExpectations:
* platform/ios/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt:
* platform/mac-wk1/TestExpectations:
* tests-options.json:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

294 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append.html
LayoutTests/imported/w3c/web-platform-tests/xhr/META.yml
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.htm with 63% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.htm with 55% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.htm with 67% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.htm with 87% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.htm with 77% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.htm with 78% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.htm with 54% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.htm with 67% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.htm with 61% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.htm with 59% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.htm with 59% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm with 88% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm with 90% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm with 85% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm with 58% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.htm with 61% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm with 60% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm with 53% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm with 77% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm with 76% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm with 76% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm with 74% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm with 50% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.js [moved from LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.htm with 68% similarity]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/formdata.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.js
LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob.html
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/auth.py [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/w3c-import.log [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/auth.py [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/w3c-import.log [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/authentication.py
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-method.py
LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.asis
LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.js [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.htm [deleted file]
LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync-expected.txt
LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.js
LayoutTests/imported/w3c/web-platform-tests/xhr/sync-xhr-and-window-onload-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/sync-xhr-and-window-onload.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/sync-xhr-supported-by-feature-policy-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/sync-xhr-supported-by-feature-policy.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async.htm
LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-simulator-wk2/TestExpectations
LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt
LayoutTests/platform/mac-mojave/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt [deleted file]
LayoutTests/platform/mac-wk1/TestExpectations
LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any-expected.txt [new file with mode: 0644]
LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt [deleted file]
LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt [deleted file]
LayoutTests/tests-options.json

index 0343abc..cf8ad71 100644 (file)
@@ -1,3 +1,17 @@
+2020-01-07  Pablo Saavedra  <psaavedra@igalia.com>
+
+        Re-sync web-platform-tests/xhr from upstream
+        https://bugs.webkit.org/show_bug.cgi?id=205641
+
+        Reviewed by Youenn Fablet.
+
+        * TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/ios-simulator-wk2/TestExpectations:
+        * platform/ios/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt:
+        * platform/mac-wk1/TestExpectations:
+        * tests-options.json:
+
 2020-01-07  Alexey Proskuryakov  <ap@apple.com>
 
         Mark webexposed/css-properties-behind-flags.html as flaky
index 47b07f1..84b6e80 100644 (file)
@@ -235,7 +235,6 @@ webkit.org/b/201666 imported/w3c/web-platform-tests/service-workers/service-work
 
 # Newly imported service worker tests that are flaky.
 imported/w3c/web-platform-tests/service-workers/service-worker/worker-client-id.https.html [ Pass Failure ]
-imported/w3c/web-platform-tests/xhr/event-timeout-order.htm [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/update-not-allowed.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/performance-timeline.https.html [ Pass Failure ]
 
@@ -513,6 +512,7 @@ imported/w3c/web-platform-tests/workers/SharedWorker_blobUrl.html [ Skip ]
 
 http/tests/cache-storage/page-cache-domcache-pending-promise.html [ DumpJSConsoleLogInStdErr ]
 
+imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker.html [ Failure ]
 imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm [ Failure ]
 imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm [ Failure ]
 imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm [ Failure ]
index c3e594d..e7ad39e 100644 (file)
@@ -1,5 +1,95 @@
 2020-01-07  Pablo Saavedra  <psaavedra@igalia.com>
 
+        Re-sync web-platform-tests/xhr from upstream
+        https://bugs.webkit.org/show_bug.cgi?id=205641
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/xhr/FormData-append-expected.txt:
+        * web-platform-tests/xhr/FormData-append.html:
+        * web-platform-tests/xhr/META.yml:
+        * web-platform-tests/xhr/abort-after-receive.htm: Removed.
+        * web-platform-tests/xhr/abort-after-send.htm: Removed.
+        * web-platform-tests/xhr/abort-after-stop.htm: Removed.
+        * web-platform-tests/xhr/abort-after-timeout.htm: Removed.
+        * web-platform-tests/xhr/abort-during-done.htm: Removed.
+        * web-platform-tests/xhr/abort-during-headers-received.htm: Removed.
+        * web-platform-tests/xhr/abort-during-loading.htm: Removed.
+        * web-platform-tests/xhr/abort-during-unsent.htm: Removed.
+        * web-platform-tests/xhr/abort-during-upload.htm: Removed.
+        * web-platform-tests/xhr/abort-event-abort.htm: Removed.
+        * web-platform-tests/xhr/abort-event-listeners.htm: Removed.
+        * web-platform-tests/xhr/abort-event-loadend.htm: Removed.
+        * web-platform-tests/xhr/abort-upload-event-abort.htm: Removed.
+        * web-platform-tests/xhr/abort-upload-event-loadend.htm: Removed.
+        * web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm: Removed.
+        * web-platform-tests/xhr/access-control-and-redirects-async.htm: Removed.
+        * web-platform-tests/xhr/access-control-and-redirects.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-async.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow-star.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-allow.htm: Removed.
+        * web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt:
+        * web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm:
+        * web-platform-tests/xhr/event-abort.htm: Removed.
+        * web-platform-tests/xhr/event-error.sub.html: Removed.
+        * web-platform-tests/xhr/event-load.htm: Removed.
+        * web-platform-tests/xhr/event-loadend.htm: Removed.
+        * web-platform-tests/xhr/event-loadstart-upload.htm: Removed.
+        * web-platform-tests/xhr/event-loadstart.htm: Removed.
+        * web-platform-tests/xhr/event-progress.htm: Removed.
+        * web-platform-tests/xhr/event-readystate-sync-open.htm: Removed.
+        * web-platform-tests/xhr/event-readystatechange-loaded.htm: Removed.
+        * web-platform-tests/xhr/event-timeout-order.htm: Removed.
+        * web-platform-tests/xhr/event-timeout.htm: Removed.
+        * web-platform-tests/xhr/event-upload-progress-crossorigin.htm: Removed.
+        * web-platform-tests/xhr/event-upload-progress.htm: Removed.
+        * web-platform-tests/xhr/formdata-expected.txt:
+        * web-platform-tests/xhr/formdata-set-expected.txt:
+        * web-platform-tests/xhr/formdata-set.htm:
+        * web-platform-tests/xhr/formdata.htm:
+        * web-platform-tests/xhr/getallresponseheaders-expected.txt:
+        * web-platform-tests/xhr/getallresponseheaders.htm:
+        * web-platform-tests/xhr/idlharness.any.js:
+        * web-platform-tests/xhr/open-during-abort-processing-expected.txt:
+        * web-platform-tests/xhr/open-during-abort-processing.htm:
+        * web-platform-tests/xhr/overridemimetype-blob.html:
+        * web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm: Removed.
+        * web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py:
+        (main):
+        * web-platform-tests/xhr/resources/authentication.py:
+        (main):
+        * web-platform-tests/xhr/resources/echo-method.py:
+        (main):
+        * web-platform-tests/xhr/resources/headers.asis:
+        * web-platform-tests/xhr/response-data-progress.htm:
+        * web-platform-tests/xhr/responsexml-document-properties-expected.txt:
+        * web-platform-tests/xhr/responsexml-document-properties.htm:
+        * web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt:
+        * web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm:
+        * web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm:
+        * web-platform-tests/xhr/send-content-type-charset.htm:
+        * web-platform-tests/xhr/send-data-arraybuffer.htm: Removed.
+        * web-platform-tests/xhr/send-data-arraybufferview.htm: Removed.
+        * web-platform-tests/xhr/send-data-es-object.htm: Removed.
+        * web-platform-tests/xhr/send-data-formdata.htm: Removed.
+        * web-platform-tests/xhr/send-redirect-bogus-sync-expected.txt:
+        * web-platform-tests/xhr/send-redirect-bogus-sync.htm:
+        * web-platform-tests/xhr/send-redirect-bogus.htm:
+        * web-platform-tests/xhr/send-redirect-post-upload.htm:
+        * web-platform-tests/xhr/setrequestheader-content-type.htm:
+        * web-platform-tests/xhr/sync-no-progress.any.js:
+        * web-platform-tests/xhr/timeout-cors-async.htm:
+        * web-platform-tests/xhr/w3c-import.log:
+
+2020-01-07  Pablo Saavedra  <psaavedra@igalia.com>
+
         Re-sync web-platform-tests/content-security-policy from upstream
         https://bugs.webkit.org/show_bug.cgi?id=205639
 
index ca2ce71..7c0aafb 100644 (file)
@@ -12,5 +12,7 @@ PASS testFormDataAppendToFormUndefined1
 PASS testFormDataAppendToFormUndefined2 
 PASS testFormDataAppendToFormNull1 
 PASS testFormDataAppendToFormNull2 
+PASS testFormDataAppendToFormString 
+PASS testFormDataAppendToFormWrongPlatformObject 
 PASS testFormDataAppendEmptyBlob 
 
index bf6c66d..a10244f 100644 (file)
         assert_equals(fd.get('key'), "null");
     }, 'testFormDataAppendToFormNull2');
     test(function() {
+        var fd = new FormData(document.getElementById("form"));
+        assert_throws(new TypeError(), () => {fd.append('name', "string", 'filename')});
+    }, 'testFormDataAppendToFormString');
+    test(function() {
+        var fd = new FormData(document.getElementById("form"));
+        assert_throws(new TypeError(), () => {fd.append('name', new URLSearchParams(), 'filename')});
+    }, 'testFormDataAppendToFormWrongPlatformObject');
+    test(function() {
         var before = new Date(new Date().getTime() - 2000); // two seconds ago, in case there's clock drift
         var fd = create_formdata(['key', new Blob(), 'blank.txt']).get('key');
         assert_equals(fd.name, "blank.txt");
index 4b2ecf3..c343cea 100644 (file)
@@ -2,9 +2,6 @@ spec: https://xhr.spec.whatwg.org/
 suggested_reviewers:
   - caitp
   - Manishearth
-  - jungkees
-  - ibelem
-  - mathiasbynens
   - jdm
   - annevk
   - wisniewskit
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any-expected.txt
new file mode 100644 (file)
index 0000000..606c860
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after successful receive should not fire "abort" event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() after successful receive should not fire "abort" event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort() after successful receive should not fire "abort" event
+
       var test = async_test();
 
       test.step(function() {
@@ -37,6 +28,3 @@
         client.open("GET", "resources/well-formed.xml", true);
         client.send(null);
       });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..606c860
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after successful receive should not fire "abort" event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any-expected.txt
new file mode 100644 (file)
index 0000000..db5d8c5
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after send() 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.js
new file mode 100644 (file)
index 0000000..0ffd887
--- /dev/null
@@ -0,0 +1,29 @@
+// META: title=XMLHttpRequest: abort() after send()
+// META: script=resources/xmlhttprequest-event-order.js
+
+      var test = async_test()
+      test.step(function() {
+        var client = new XMLHttpRequest(),
+            control_flag = false;
+        prepare_xhr_for_event_order_test(client);
+        client.addEventListener("readystatechange", test.step_func(function() {
+          if(client.readyState == 4) {
+            control_flag = true
+            if (self.GLOBAL.isWindow()) {
+              assert_equals(client.responseXML, null)
+            }
+            assert_equals(client.responseText, "")
+            assert_equals(client.status, 0)
+            assert_equals(client.statusText, "")
+            assert_equals(client.getAllResponseHeaders(), "")
+            assert_equals(client.getResponseHeader('Content-Type'), null)
+          }
+        }))
+        client.open("GET", "resources/well-formed.xml", true)
+        client.send(null)
+        client.abort()
+        assert_true(control_flag)
+        assert_equals(client.readyState, 0)
+        assert_xhr_event_order_matches([1, "loadstart(0,0,false)", 4, "abort(0,0,false)", "loadend(0,0,false)"])
+        test.done()
+      })
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..db5d8c5
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after send() 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm
deleted file mode 100644 (file)
index 523a0d6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() after send()</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/xmlhttprequest-event-order.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[1] following-sibling::ol/li[3] following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[1] following-sibling::ol/li[4]/ol/li[3] following-sibling::ol/li[4]/ol/li[4] following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[5]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[1] following::dd[1]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test()
-      test.step(function() {
-        var client = new XMLHttpRequest(),
-            control_flag = false;
-        prepare_xhr_for_event_order_test(client);
-        client.addEventListener("readystatechange", test.step_func(function() {
-          if(client.readyState == 4) {
-            control_flag = true
-            assert_equals(client.responseXML, null)
-            assert_equals(client.responseText, "")
-            assert_equals(client.status, 0)
-            assert_equals(client.statusText, "")
-            assert_equals(client.getAllResponseHeaders(), "")
-            assert_equals(client.getResponseHeader('Content-Type'), null)
-          }
-        }))
-        client.open("GET", "resources/well-formed.xml", true)
-        client.send(null)
-        client.abort()
-        assert_true(control_flag)
-        assert_equals(client.readyState, 0)
-        assert_xhr_event_order_matches([1, "loadstart(0,0,false)", 4, "abort(0,0,false)", "loadend(0,0,false)"])
-        test.done()
-      })
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window-expected.txt
new file mode 100644 (file)
index 0000000..1ebb2c0
--- /dev/null
@@ -0,0 +1,3 @@
+
+FAIL XMLHttpRequest: abort event should fire when stop() method is used assert_equals: expected true but got false
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.window.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort event should fire when stop() method is used</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[3] following::dt[3]/following::dd[1]/p"/>
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort event should fire when stop() method is used
+
       var test = async_test();
       window.onload = test.step_func(function() {
         var client = new XMLHttpRequest();
@@ -17,6 +8,7 @@
         client.onabort = test.step_func(function (e) {
           assert_false(sync);
           assert_equals(e.type, 'abort');
+          assert_equals(client.status, 0);
           abortFired = true;
         });
         client.open("GET", "resources/delay.py?ms=3000", true);
@@ -28,6 +20,3 @@
         window.stop();
         sync = false;
       });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any-expected.txt
new file mode 100644 (file)
index 0000000..04106e6
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after a timeout should not fire "abort" event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,15 +1,5 @@
-<!doctype html>
-<html>
-<head>
-    <title>XMLHttpRequest: abort() after a timeout should not fire "abort" event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]"/>
-</head>
-<body>
-<div id="log"></div>
-<script>
+// META: title=XMLHttpRequest: abort() after a timeout should not fire "abort" event
+
     var test = async_test();
 
     test.step(function() {
@@ -51,6 +41,3 @@
         client.open("GET", "/common/blank.html?pipe=trickle(d1)", true);
         client.send(null);
     });
-</script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..04106e6
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() after a timeout should not fire "abort" event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window-expected.txt
new file mode 100644 (file)
index 0000000..bec1fa2
--- /dev/null
@@ -0,0 +1,5 @@
+
+PASS XMLHttpRequest: abort() during DONE (sync) 
+PASS XMLHttpRequest: abort() during DONE (sync aborted in readystatechange) 
+PASS XMLHttpRequest: abort() during DONE (async) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.window.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() during DONE</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort() during DONE
+
       async_test(test => {
         var client = new XMLHttpRequest(),
             result = [],
@@ -85,6 +76,3 @@
         client.open("GET", "resources/well-formed.xml")
         client.send(null)
       }, document.title + " (async)")
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window-expected.txt
new file mode 100644 (file)
index 0000000..5c5a189
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() during HEADERS_RECEIVED 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.window.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() during HEADERS_RECEIVED</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort() during HEADERS_RECEIVED
+
       async_test(test => {
         var client = new XMLHttpRequest(),
             result = [],
@@ -48,6 +39,3 @@
         client.open("GET", "resources/well-formed.xml")
         client.send(null)
       })
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window-expected.txt
new file mode 100644 (file)
index 0000000..b073af6
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() during LOADING 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.window.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() during LOADING</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort() during LOADING
+
       async_test(test => {
         var client = new XMLHttpRequest(),
             result = [],
@@ -48,6 +39,3 @@
         client.open("GET", "resources/well-formed.xml")
         client.send(null)
       })
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any-expected.txt
new file mode 100644 (file)
index 0000000..ea7d264
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() during UNSENT 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,5 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() during UNSENT</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+// META: title=XMLHttpRequest: abort() during UNSENT
+
       var test = async_test()
       test.step(function() {
         var client = new XMLHttpRequest()
@@ -26,6 +17,3 @@
         assert_equals(client.statusText, "")
       })
       test.done()
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..ea7d264
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() during UNSENT 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any-expected.txt
new file mode 100644 (file)
index 0000000..5b13c50
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() while sending data 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.js
new file mode 100644 (file)
index 0000000..fe4963d
--- /dev/null
@@ -0,0 +1,17 @@
+// META: title=XMLHttpRequest: abort() while sending data
+// META: script=resources/xmlhttprequest-event-order.js
+
+      var test = async_test()
+      test.step(function() {
+        var client = new XMLHttpRequest()
+        prepare_xhr_for_event_order_test(client);
+        client.open("POST", "resources/delay.py?ms=1000")
+        client.addEventListener("loadend", function(e) {
+          test.step(function() {
+            assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,9999,true)", 4, "upload.abort(0,0,false)", "upload.loadend(0,0,false)", "abort(0,0,false)", "loadend(0,0,false)"]);
+            test.done()
+          })
+        });
+        client.send((new Array(10000)).join('a'))
+        client.abort()
+      })
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..5b13c50
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() while sending data 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm
deleted file mode 100644 (file)
index 9fbc8b9..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() while sending data</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/xmlhttprequest-event-order.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7] following-sibling::ol/li[4]/ol/li[7]/ol/li[2] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[1] following::ul[1]/li[2]/ol[1]/li[2] following::ul[1]/li[2]/ol[1]/li[3] following::ul[1]/li[2]/ol[1]/li[4]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test(document.title, {timeout:1100})
-      test.step(function() {
-        var client = new XMLHttpRequest()
-        prepare_xhr_for_event_order_test(client);
-        client.open("POST", "resources/delay.py?ms=1000")
-        client.addEventListener("loadend", function(e) {
-          test.step(function() {
-            assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,9999,true)", 4, "upload.abort(0,0,false)", "upload.loadend(0,0,false)", "abort(0,0,false)", "loadend(0,0,false)"]);
-            test.done()
-          })
-        });
-        client.send((new Array(10000)).join('a'))
-        client.abort()
-      })
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any-expected.txt
new file mode 100644 (file)
index 0000000..7a4c1a5
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: do not fire abort event in OPENED state when send() flag is unset. 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,16 +1,5 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[5]" />
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The abort() method: do not fire abort event in OPENED state when send() flag is unset.</title>
-</head>
+// META: title=XMLHttpRequest: The abort() method: do not fire abort event in OPENED state when send() flag is unset.
 
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
         var test = async_test()
 
         test.step(function()
@@ -41,6 +30,3 @@
             xhr.send() // should not throw since abort() was a no-op
             test.done()
         });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..7a4c1a5
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: do not fire abort event in OPENED state when send() flag is unset. 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any-expected.txt
new file mode 100644 (file)
index 0000000..7522e14
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() should not reset event listeners 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.js
new file mode 100644 (file)
index 0000000..67bbae6
--- /dev/null
@@ -0,0 +1,13 @@
+// META: title=XMLHttpRequest: abort() should not reset event listeners
+
+      var test = async_test()
+      test.step(function() {
+        var client = new XMLHttpRequest(),
+            test = function() {}
+        client.onreadystatechange = test
+        client.open("GET", "resources/well-formed.xml")
+        client.send(null)
+        client.abort()
+        assert_equals(client.onreadystatechange, test)
+      })
+      test.done()
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..7522e14
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort() should not reset event listeners 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm
deleted file mode 100644 (file)
index 1c50ed3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort() should not reset event listeners</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[6] following-sibling::ol/li[7]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test()
-      test.step(function() {
-        var client = new XMLHttpRequest(),
-            test = function() {}
-        client.onreadystatechange = test
-        client.open("GET", "resources/well-formed.xml")
-        client.send(null)
-        client.abort()
-        assert_equals(client.onreadystatechange, test)
-      })
-      test.done()
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any-expected.txt
new file mode 100644 (file)
index 0000000..7f327fd
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named loadend 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,16 +1,5 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[6]"/>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The abort() method: Fire a progress event named loadend</title>
-</head>
+// META: title=XMLHttpRequest: The abort() method: Fire a progress event named loadend
 
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
         var test = async_test(function(test)
         {
             var xhr = new XMLHttpRequest();
@@ -39,6 +28,3 @@
             xhr.open("GET", "resources/content.py", true);
             xhr.send();
         });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..7f327fd
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named loadend 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any-expected.txt
new file mode 100644 (file)
index 0000000..5d40e11
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,17 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" />
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
+        var test = async_test("XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object");
 
         test.step(function()
         {
@@ -42,6 +29,3 @@
             xhr.open("POST", "./resources/content.py", true);
             xhr.send("Test Message");
         });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..5d40e11
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any-expected.txt
new file mode 100644 (file)
index 0000000..983788d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,17 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
+        var test = async_test("XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object");
 
         test.step(function()
         {
@@ -42,6 +29,3 @@
             xhr.open("POST", "./resources/content.py", true);
             xhr.send("Test Message");
         });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..983788d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any-expected.txt
new file mode 100644 (file)
index 0000000..6cc1da1
--- /dev/null
@@ -0,0 +1,8 @@
+
+PASS Request without credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star) 
+PASS Request with credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star) 
+PASS Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin 
+PASS Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin 
+PASS Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials) 
+PASS Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script>
+// META: title=Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.
+// META: script=/common/get-host-info.sub.js
+
     function runTest(test, path, credentials, expectSuccess) {
       const xhr = new XMLHttpRequest();
       xhr.withCredentials = credentials;
@@ -66,6 +59,3 @@
       runTest(t, "/xhr/resources/access-control-basic-allow-no-credentials.py",
           withCredentials, fails)
     }, "Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials)");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..6cc1da1
--- /dev/null
@@ -0,0 +1,8 @@
+
+PASS Request without credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star) 
+PASS Request with credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star) 
+PASS Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin 
+PASS Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin 
+PASS Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials) 
+PASS Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any-expected.txt
new file mode 100644 (file)
index 0000000..9f119b4
--- /dev/null
@@ -0,0 +1,9 @@
+
+PASS Request is redirected without CORS headers to a response with Access-Control-Allow-Origin=* 
+PASS Request is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Request with user info is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Request is redirect to a bad URL 
+PASS Preflighted request is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Preflighted request is redirected to a response with Access-Control-Allow-Origin=* and header allowed 
+PASS Request is redirected to a same-origin resource file 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script>
+// META: title=Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.
+// META: script=/common/get-host-info.sub.js
+
     function runTest(test, destination, parameters, customHeader, local, expectSuccess) {
       const xhr = new XMLHttpRequest();
       const url = (local ? get_host_info().HTTP_ORIGIN : get_host_info().HTTP_REMOTE_ORIGIN) +
@@ -84,6 +77,3 @@
       runTest(t, get_host_info().HTTP_ORIGIN + "/xhr/resources/pass.txt",
           "", withCustomHeader, local, succeeds)
     }, "Request is redirected to a same-origin resource file");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..9f119b4
--- /dev/null
@@ -0,0 +1,9 @@
+
+PASS Request is redirected without CORS headers to a response with Access-Control-Allow-Origin=* 
+PASS Request is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Request with user info is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Request is redirect to a bad URL 
+PASS Preflighted request is redirected to a response with Access-Control-Allow-Origin=* 
+PASS Preflighted request is redirected to a response with Access-Control-Allow-Origin=* and header allowed 
+PASS Request is redirected to a same-origin resource file 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any-expected.txt
new file mode 100644 (file)
index 0000000..be57c53
--- /dev/null
@@ -0,0 +1,8 @@
+
+PASS Local sync redirect to remote origin 
+PASS Local async redirect to remote origin 
+PASS Remote sync redirect to local origin 
+PASS Remote async redirect to local origin 
+PASS Remote sync redirect to same remote origin 
+PASS Remote async redirect to same remote origin 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests that redirects between origins are allowed when access control is involved.</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script>
+// META: title=Tests that redirects between origins are allowed when access control is involved.
+// META: script=/common/get-host-info.sub.js
+
     function runSync(test, url)
     {
       const xhr = new XMLHttpRequest();
@@ -55,6 +48,3 @@
           "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
           "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
     }, "Remote async redirect to same remote origin");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..be57c53
--- /dev/null
@@ -0,0 +1,8 @@
+
+PASS Local sync redirect to remote origin 
+PASS Local async redirect to remote origin 
+PASS Remote sync redirect to local origin 
+PASS Remote async redirect to local origin 
+PASS Remote sync redirect to same remote origin 
+PASS Remote async redirect to same remote origin 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any-expected.txt
new file mode 100644 (file)
index 0000000..c97ef65
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Access control test with origin header 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,12 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Access control test with origin header
+// META: script=/common/get-host-info.sub.js
+
     async_test(function(test) {
       const xhr = new XMLHttpRequest;
 
@@ -17,6 +11,3 @@
           "HTTP_ORIGIN: " + get_host_info().HTTP_ORIGIN);
       test.done();
     }, "Access control test with origin header");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..c97ef65
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Access control test with origin header 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any-expected.txt
new file mode 100644 (file)
index 0000000..2e0a494
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Basic async cross-origin XHR request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Testing a basic asynchronous CORS XHR request</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Testing a basic asynchronous CORS XHR request.
+// META: script=/common/get-host-info.sub.js
+
     async_test(function(test) {
       const xhr = new XMLHttpRequest;
 
@@ -24,6 +17,3 @@
           "/xhr/resources/access-control-basic-allow.py", true);
       xhr.send();
     }, "Basic async cross-origin XHR request");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..2e0a494
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Basic async cross-origin XHR request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any-expected.txt
new file mode 100644 (file)
index 0000000..ebd7eb7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow async PUT request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests cross-origin async request with non-CORS-safelisted method</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Tests cross-origin async request with non-CORS-safelisted method
+// META: script=/common/get-host-info.sub.js
+
     async_test((test) => {
       const xhr = new XMLHttpRequest;
 
@@ -22,6 +15,3 @@
       xhr.setRequestHeader("Content-Type", "text/plain; charset=UTF-8");
       xhr.send("PASS: PUT data received");
     }, "Allow async PUT request");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..ebd7eb7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow async PUT request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any-expected.txt
new file mode 100644 (file)
index 0000000..9128a60
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow PUT request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests cross-origin request with non-CORS-safelisted method</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Tests cross-origin request with non-CORS-safelisted method
+// META: script=/common/get-host-info.sub.js
+
     test(function() {
       const xhr = new XMLHttpRequest;
 
@@ -19,6 +12,3 @@
 
       assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.\nPASS: PUT data received");
     }, "Allow PUT request");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..9128a60
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow PUT request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any-expected.txt
new file mode 100644 (file)
index 0000000..c5b9c8d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated in presence of custom header 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,7 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Preflight cache should be invalidated in presence of custom header</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="/common/utils.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Preflight cache should be invalidated in presence of custom header
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+
     const uuid = token();
     const xhr = new XMLHttpRequest;
 
@@ -43,6 +36,3 @@
         xhr.send();
       }
     }, "Preflight cache should be invalidated in presence of custom header");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..c5b9c8d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated in presence of custom header 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any-expected.txt
new file mode 100644 (file)
index 0000000..54627b1
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated by changed method 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,7 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Preflight cache should be invalidated by changed method</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="/common/utils.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Preflight cache should be invalidated by changed method
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+
     const uuid = token();
     const xhr = new XMLHttpRequest;
 
@@ -42,7 +35,3 @@
         xhr.send();
       }
     }, "Preflight cache should be invalidated by changed method");
-
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..54627b1
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated by changed method 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any-expected.txt
new file mode 100644 (file)
index 0000000..b5566db
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated on timeout 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,8 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Preflight cache should be invalidated on timeout</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="/common/utils.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Preflight cache should be invalidated on timeout
+// META: timeout=long
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+
     const uuid = token();
     let xhr = new XMLHttpRequest;
 
@@ -41,6 +35,3 @@
         xhr.send();
       }
     }, "Preflight cache should be invalidated on timeout");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..b5566db
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should be invalidated on timeout 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any-expected.txt
new file mode 100644 (file)
index 0000000..e98c159
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should allow second request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,7 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Preflight cache should allow second request without preflight OPTIONS request</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="/common/utils.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
+// META: title=Preflight cache should allow second request without preflight OPTIONS request
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+
     const uuid = token();
 
     async_test(function(test) {
@@ -40,6 +33,3 @@
         xhr.send();
       }
     }, "Preflight cache should allow second request");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..e98c159
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Preflight cache should allow second request 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any-expected.txt
new file mode 100644 (file)
index 0000000..1f4b437
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow star 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.js
new file mode 100644 (file)
index 0000000..c7ab3fe
--- /dev/null
@@ -0,0 +1,12 @@
+// META: title=Tests "*" setting for Access-Control-Allow-Origin header
+// META: script=/common/get-host-info.sub.js
+
+    const xhr = new XMLHttpRequest;
+
+    test(function(test) {
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow-star.py", false);
+
+      xhr.send();
+
+      assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.");
+    }, "Allow star");
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..1f4b437
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow star 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm
deleted file mode 100644 (file)
index d05222f..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests "*" setting for Access-Control-Allow-Origin header</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
-    const xhr = new XMLHttpRequest;
-
-    test(function(test) {
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow-star.py", false);
-
-      xhr.send();
-
-      assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.");
-    }, "Allow star");
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any-expected.txt
new file mode 100644 (file)
index 0000000..a088d01
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow basic 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.js
new file mode 100644 (file)
index 0000000..c895383
--- /dev/null
@@ -0,0 +1,12 @@
+// META: title=Tests CORS with Access-Control-Allow-Origin header
+// META: script=/common/get-host-info.sub.js
+
+    test(function() {
+      const xhr = new XMLHttpRequest;
+
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow.py", false);
+
+      xhr.send();
+
+      assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.");
+    }, "Allow basic");
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..a088d01
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS Allow basic 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm
deleted file mode 100644 (file)
index 61c02ed..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Tests CORS with Access-Control-Allow-Origin header</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">
-    test(function() {
-      const xhr = new XMLHttpRequest;
-
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow.py", false);
-
-      xhr.send();
-
-      assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.");
-    }, "Allow basic");
-    </script>
-  </body>
-</html>
index 20b875b..5687049 100644 (file)
@@ -17,7 +17,6 @@
       xhr.setRequestHeader("Accept-Language", "ru");
       xhr.setRequestHeader("Content-Language", "ru");
       xhr.setRequestHeader("Content-Type", "text/plain");
-      xhr.setRequestHeader("Save-Data", "on");
 
       xhr.send();
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect-expected.txt
new file mode 100644 (file)
index 0000000..19cab1b
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XHR should respect access-control-expose-headers header on redirect 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-expose-headers-on-redirect.html
new file mode 100644 (file)
index 0000000..f06ec0c
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>XHR should respect access-control-expose-headers header on redirect</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+<script type="text/javascript">
+async_test((test) => {
+  const xhr = new XMLHttpRequest;
+
+  xhr.onerror = test.unreached_func("Unexpected error.");
+
+  xhr.onload = test.step_func_done(() => {
+    assert_equals(xhr.status, 200);
+    assert_equals(xhr.getResponseHeader('foo'), 'bar');
+    assert_equals(xhr.getResponseHeader('hoge'), null);
+  });
+
+  const destination = get_host_info().HTTP_REMOTE_ORIGIN +
+    '/common/blank.html?pipe=header(access-control-allow-origin,*)|' +
+    'header(access-control-expose-headers,foo)|' +
+    'header(foo,bar)|header(hoge,fuga)';
+  const url =
+    'resources/redirect.py?location=' + encodeURIComponent(destination);
+  xhr.open('GET', url);
+  xhr.send();
+});
+</script>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any-expected.txt
new file mode 100644 (file)
index 0000000..a89c58e
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.js
new file mode 100644 (file)
index 0000000..9b38ccf
--- /dev/null
@@ -0,0 +1,15 @@
+// META: title=XMLHttpRequest: abort event
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.onabort = test.step_func(function () {
+    test.done();
+  });
+  client.open("GET", "resources/well-formed.xml");
+  client.send(null);
+  client.abort();
+  test.step_timeout(() => {
+    assert_unreached("onabort not called after 4 ms");
+  }, 4);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..a89c58e
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: abort event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm
deleted file mode 100644 (file)
index 2f80d1b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: abort event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onabort" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-abort" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-abort" data-tested-assertations="following::ol//ol//ol/li[3]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test();
-      test.step(function() {
-        var client = new XMLHttpRequest();
-        client.onabort = test.step_func(function() {
-          test.done();
-        });
-        client.open("GET", "resources/well-formed.xml");
-        client.send(null);
-        client.abort();
-        test.step_timeout(() => {
-          assert_unreached("onabort not called after 4 ms");
-        }, 4);
-      });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any-expected.txt
new file mode 100644 (file)
index 0000000..98404c8
--- /dev/null
@@ -0,0 +1,4 @@
+Blocked access to external URL http://nonexistent.localhost:8800/
+
+PASS XMLHttpRequest Test: event - error 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.js
new file mode 100644 (file)
index 0000000..df63dc0
--- /dev/null
@@ -0,0 +1,13 @@
+// META: title=XMLHttpRequest Test: event - error
+
+async_test(function (t) {
+  var client = new XMLHttpRequest();
+  client.onerror = t.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.type, "error");
+    t.done();
+  });
+
+  client.open("GET", "http://nonexistent.{{host}}:{{ports[http][0]}}");
+  client.send("null");
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..98404c8
--- /dev/null
@@ -0,0 +1,4 @@
+Blocked access to external URL http://nonexistent.localhost:8800/
+
+PASS XMLHttpRequest Test: event - error 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html
deleted file mode 100644 (file)
index 5f27560..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>XMLHttpRequest Test: event - error</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="Check if event onerror is fired When the request has failed.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<div id="log"></div>
-
-<script>
-
-async_test(function (t) {
-  var client = new XMLHttpRequest();
-  client.onerror = t.step_func(function(e) {
-    assert_true(e instanceof ProgressEvent);
-    assert_equals(e.type, "error");
-    t.done();
-  });
-
-  client.open("GET", "http://nonexistent.{{host}}:{{ports[http][0]}}");
-  client.send("null");
-}, document.title);
-
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any-expected.txt
new file mode 100644 (file)
index 0000000..d044be7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire an event named load (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.js
new file mode 100644 (file)
index 0000000..72e46a5
--- /dev/null
@@ -0,0 +1,21 @@
+// META: title=XMLHttpRequest: The send() method: Fire an event named load (synchronous flag is unset)
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.onload = test.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.type, "load");
+    assert_equals(client.readyState, 4);
+    test.done();
+  });
+  client.onreadystatechange = test.step_func(function () {
+    if (client.readyState !== 4) return;
+
+    test.step_timeout(() => {
+      assert_unreached("Didn't get load event within 4ms of readystatechange==4");
+    }, 4);
+  });
+  client.open("GET", "resources/well-formed.xml");
+  client.send(null);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..d044be7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire an event named load (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm
deleted file mode 100644 (file)
index cdd0c5b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>XMLHttpRequest: The send() method: Fire an event named load (synchronous flag is unset)</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onload" data-tested-assertations="../.." />
-<link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-load" data-tested-assertations="../.." />
-<div id="log"></div>
-
-<script>
-  var test = async_test();
-  test.step(function() {
-    var client = new XMLHttpRequest();
-    client.onload = test.step_func(function(e) {
-      assert_true(e instanceof ProgressEvent);
-      assert_equals(e.type, "load");
-      assert_equals(client.readyState, 4);
-      test.done();
-    });
-    client.onreadystatechange = test.step_func(function() {
-      if (client.readyState !== 4) return;
-
-      test.step_timeout(() => {
-          assert_unreached("Didn't get load event within 4ms of readystatechange==4");
-      }, 4);
-    });
-    client.open("GET", "resources/well-formed.xml");
-    client.send(null);
-  });
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any-expected.txt
new file mode 100644 (file)
index 0000000..4cc92e8
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: loadend event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.js
new file mode 100644 (file)
index 0000000..7bd1844
--- /dev/null
@@ -0,0 +1,19 @@
+// META: title=XMLHttpRequest: loadend event
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.onloadend = test.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.type, "loadend");
+    test.done();
+  });
+  client.onreadystatechange = function () {
+    if (client.readyState !== 4) return;
+    test.step_timeout(() => {
+      assert_unreached("onloadend not called after 100 ms");
+    }, 100);
+  };
+  client.open("GET", "resources/well-formed.xml");
+  client.send(null);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..4cc92e8
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: loadend event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm
deleted file mode 100644 (file)
index b17d9b9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: loadend event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="/../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="/../.." />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test();
-      test.step(function() {
-        var client = new XMLHttpRequest();
-        client.onloadend = test.step_func(function(e) {
-         assert_true(e instanceof ProgressEvent);
-         assert_equals(e.type, "loadend");
-         test.done();
-        });
-        client.onreadystatechange = function() {
-          if (client.readyState !== 4) return;
-          test.step_timeout(() => {
-            assert_unreached("onloadend not called after 100 ms");
-          }, 100);
-        };
-        client.open("GET", "resources/well-formed.xml");
-        client.send(null);
-      });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any-expected.txt
new file mode 100644 (file)
index 0000000..418c07f
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire a progress event named loadstart on upload object (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.js
new file mode 100644 (file)
index 0000000..0f41cd1
--- /dev/null
@@ -0,0 +1,19 @@
+// META: title=XMLHttpRequest: The send() method: Fire a progress event named loadstart on upload object (synchronous flag is unset)
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.upload.onloadstart = test.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.total, 7, 'upload.onloadstart: event.total');
+    assert_equals(e.loaded, 0, 'upload.onloadstart: event.loaded');
+    assert_equals(e.type, "loadstart");
+    test.done();
+  });
+  client.onreadystatechange = test.step_func(function () {
+    if (client.readyState === 4)
+      assert_unreached("onloadstart not called.");
+  });
+  client.open("POST", "resources/trickle.py?ms=5&count=8");
+  client.send('foo=bar');
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..418c07f
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire a progress event named loadstart on upload object (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm
deleted file mode 100644 (file)
index 275d418..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype html>
-<html lang=en>
-<meta charset=utf-8>
-<title>XMLHttpRequest: The send() method: Fire a progress event named loadstart on upload object (synchronous flag is unset)</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
-<link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-progress" data-tested-assertations="../.." />
-<div id="log"></div>
-<script>
-  var test = async_test();
-  test.step(function() {
-    var client = new XMLHttpRequest();
-    client.upload.onloadstart = test.step_func(function(e) {
-      assert_true(e instanceof ProgressEvent);
-      assert_equals(e.total, 7, 'upload.onloadstart: event.total');
-      assert_equals(e.loaded, 0, 'upload.onloadstart: event.loaded');
-      assert_equals(e.type, "loadstart");
-      test.done();
-    });
-    client.onreadystatechange = test.step_func(function() {
-      if (client.readyState === 4)
-        assert_unreached("onloadstart not called.");
-    });
-    client.open("POST", "resources/trickle.py?ms=5&count=8");
-    client.send('foo=bar');
-  });
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any-expected.txt
new file mode 100644 (file)
index 0000000..bbed518
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: loadstart event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.js
new file mode 100644 (file)
index 0000000..4778404
--- /dev/null
@@ -0,0 +1,17 @@
+// META: title=XMLHttpRequest: loadstart event
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.onloadstart = test.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.type, "loadstart");
+    assert_equals(client.readyState, 1);
+    test.done();
+  });
+  test.step_timeout(function () {
+    assert_unreached("onloadstart not called after 500 ms");
+  }, 500);
+  client.open("GET", "resources/well-formed.xml");
+  client.send(null);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..bbed518
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: loadstart event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm
deleted file mode 100644 (file)
index 442be93..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: loadstart event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test();
-      test.step(function() {
-        var client = new XMLHttpRequest();
-        client.onloadstart = test.step_func(function(e) {
-          assert_true(e instanceof ProgressEvent);
-          assert_equals(e.type, "loadstart");
-          assert_equals(client.readyState, 1);
-          test.done();
-        });
-        test.step_timeout(function () {
-          assert_unreached("onloadstart not called after 500 ms");
-        }, 500);
-        client.open("GET", "resources/well-formed.xml");
-        client.send(null);
-      });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any-expected.txt
new file mode 100644 (file)
index 0000000..22ade06
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire a progress event named progress (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.js
new file mode 100644 (file)
index 0000000..0e7c3a4
--- /dev/null
@@ -0,0 +1,18 @@
+// META: title=XMLHttpRequest: The send() method: Fire a progress event named progress (synchronous flag is unset)
+// META: timeout=long
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.onprogress = test.step_func(function (e) {
+    assert_true(e instanceof ProgressEvent);
+    assert_equals(e.type, "progress");
+    test.done();
+  });
+  client.onreadystatechange = test.step_func(function () {
+    if (client.readyState === 4)
+      assert_unreached("onprogress not called.");
+  });
+  client.open("GET", "resources/trickle.py?count=4&delay=150");
+  client.send(null);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..22ade06
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: The send() method: Fire a progress event named progress (synchronous flag is unset) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm
deleted file mode 100644 (file)
index 65d3f28..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<html lang=en>
-<meta charset=utf-8>
-<title>XMLHttpRequest: The send() method: Fire a progress event named progress (synchronous flag is unset)</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
-<link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-progress" data-tested-assertations="../.." />
-<div id="log"></div>
-<script>
-  var test = async_test();
-  test.step(function() {
-    var client = new XMLHttpRequest();
-    client.onprogress = test.step_func(function(e) {
-      assert_true(e instanceof ProgressEvent);
-      assert_equals(e.type, "progress");
-      test.done();
-    });
-    client.onreadystatechange = test.step_func(function() {
-      if (client.readyState === 4)
-        assert_unreached("onprogress not called.");
-    });
-    client.open("GET", "resources/trickle.py?count=4&delay=150");
-    client.send(null);
-  });
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any-expected.txt
new file mode 100644 (file)
index 0000000..765c952
--- /dev/null
@@ -0,0 +1,4 @@
+
+PASS XMLHttpRequest: open() call fires sync readystate event (sync) 
+PASS XMLHttpRequest: open() call fires sync readystate event (async) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.js
new file mode 100644 (file)
index 0000000..321635e
--- /dev/null
@@ -0,0 +1,23 @@
+// META: title=XMLHttpRequest: open() call fires sync readystate event
+
+const title = "XMLHttpRequest: open() call fires sync readystate event";
+
+test(function () {
+  var client = new XMLHttpRequest()
+  var eventsFired = []
+  client.onreadystatechange = function () {
+    eventsFired.push(client.readyState)
+  }
+  client.open('GET', "...", false)
+  assert_array_equals(eventsFired, [1])
+}, title + ' (sync)');
+
+test(function () {
+  var client = new XMLHttpRequest()
+  var eventsFired = []
+  client.onreadystatechange = function () {
+    eventsFired.push(client.readyState)
+  }
+  client.open('GET', "...", true)
+  assert_array_equals(eventsFired, [1])
+}, title + ' (async)');
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..765c952
--- /dev/null
@@ -0,0 +1,4 @@
+
+PASS XMLHttpRequest: open() call fires sync readystate event (sync) 
+PASS XMLHttpRequest: open() call fires sync readystate event (async) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm
deleted file mode 100644 (file)
index ae9697e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>XMLHttpRequest: open() call fires sync readystate event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[13]/ol[1]/li[2]" />
-
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      test(function() {
-        var client = new XMLHttpRequest()
-        var eventsFired = []
-        client.onreadystatechange = function(){
-          eventsFired.push(client.readyState)
-        }
-        client.open('GET', "...", false)
-        assert_array_equals(eventsFired, [1])
-      }, document.title + ' (sync)')
-      test(function() {
-        var client = new XMLHttpRequest()
-        var eventsFired = []
-        client.onreadystatechange = function(){
-          eventsFired.push(client.readyState)
-        }
-        client.open('GET', "...", true)
-        assert_array_equals(eventsFired, [1])
-      }, document.title + ' (async)')
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any-expected.txt
new file mode 100644 (file)
index 0000000..c110e02
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: the LOADING state change may be emitted multiple times 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,24 +1,12 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>XMLHttpRequest: the LOADING state change may be emitted multiple times</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[10]/dt[1]">
-</head>
-
-<div id="log"></div>
-
-<script>
+// META: title=XMLHttpRequest: the LOADING state change may be emitted multiple times
 
 var test = async_test();
 
-test.step(function() {
+test.step(function () {
     var client = new XMLHttpRequest();
     var countedLoading = 0;
 
-    client.onreadystatechange = test.step_func(function() {
+    client.onreadystatechange = test.step_func(function () {
         if (client.readyState === 3) {
             countedLoading += 1;
         }
@@ -32,5 +20,4 @@ test.step(function() {
 
     client.open("GET", "resources/trickle.py?count=10"); // default timeout in trickle.py is 1/2 sec, so this request will take 5 seconds to complete
     client.send(null);
-});
-</script>
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..c110e02
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: the LOADING state change may be emitted multiple times 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any-expected.txt
new file mode 100644 (file)
index 0000000..f729686
--- /dev/null
@@ -0,0 +1,3 @@
+
+FAIL XMLHttpRequest: event - timeout (order of events) assert_equals: expected "readystatechange(4)" but got "upload.progress(12,12,true)"
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.js
new file mode 100644 (file)
index 0000000..b35e908
--- /dev/null
@@ -0,0 +1,21 @@
+// META: title=XMLHttpRequest: event - timeout (order of events)
+// META: script=resources/xmlhttprequest-event-order.js
+
+var test = async_test();
+test.step(function () {
+    var xhr = new XMLHttpRequest();
+    prepare_xhr_for_event_order_test(xhr);
+    xhr.addEventListener("loadend", function () {
+        test.step(function () {
+            assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,12,true)", 4, "upload.timeout(0,0,false)", "upload.loadend(0,0,false)", "timeout(0,0,false)", "loadend(0,0,false)"]);
+            test.done();
+        });
+    });
+
+    xhr.timeout = 5;
+    xhr.open("POST", "resources/delay.py?ms=20000");
+    xhr.send("Test Message");
+    test.step_timeout(() => {
+        assert_unreached("ontimeout not called.");
+    }, 10);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..0dc1527
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: event - timeout (order of events) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm
deleted file mode 100644 (file)
index d4dc780..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta name="assert" content="Check the order of events fired when the request has failed.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/xmlhttprequest-event-order.js"></script>
-    <title>XMLHttpRequest: event - timeout (order of events)</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
-
-        test.step(function()
-        {
-            var xhr = new XMLHttpRequest();
-            prepare_xhr_for_event_order_test(xhr);
-            xhr.addEventListener("loadend", function() {
-                test.step(function() {
-                    assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,12,true)", 4, "upload.timeout(0,0,false)", "upload.loadend(0,0,false)", "timeout(0,0,false)", "loadend(0,0,false)"]);
-                    test.done();
-                });
-            });
-
-            xhr.timeout = 5;
-            xhr.open("POST", "resources/delay.py?ms=20000");
-            xhr.send("Test Message");
-            test.step_timeout(() => {
-              assert_unreached("ontimeout not called.");
-            }, 10);
-        });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any-expected.txt
new file mode 100644 (file)
index 0000000..a054dd7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: timeout event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.js
new file mode 100644 (file)
index 0000000..d114b08
--- /dev/null
@@ -0,0 +1,18 @@
+// META: title=XMLHttpRequest: timeout event
+
+var test = async_test();
+test.step(function () {
+  var client = new XMLHttpRequest();
+  client.ontimeout = function () {
+    test.step(function () {
+      assert_equals(client.readyState, 4);
+      test.done();
+    });
+  };
+  client.timeout = 5;
+  client.open("GET", "resources/delay.py?ms=20000");
+  client.send(null);
+  test.step_timeout(() => {
+    assert_unreached("ontimeout not called.");
+  }, 10);
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..a054dd7
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: timeout event 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm
deleted file mode 100644 (file)
index c402135..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: timeout event</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-timeout" data-tested-assertations="../.." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".." />
-    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test();
-      test.step(function() {
-        var client = new XMLHttpRequest();
-        client.ontimeout = function() {
-          test.step(function() {
-            assert_equals(client.readyState, 4);
-            test.done();
-          });
-        };
-        client.timeout = 5;
-        client.open("GET", "resources/delay.py?ms=20000");
-        client.send(null);
-        test.step_timeout(() => {
-          assert_unreached("ontimeout not called.");
-        }, 10);
-      });
-    </script>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any-expected.txt
new file mode 100644 (file)
index 0000000..4fdf53b
--- /dev/null
@@ -0,0 +1,6 @@
+
+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.js
new file mode 100644 (file)
index 0000000..1036f2b
--- /dev/null
@@ -0,0 +1,26 @@
+// META: title=XMLHttpRequest: upload progress event for cross-origin requests
+// META: script=/common/get-host-info.sub.js
+
+const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
+  redirect = "resources/redirect.py?code=307&location=" + remote;
+
+[remote, redirect].forEach(url => {
+  async_test(test => {
+    const client = new XMLHttpRequest();
+    client.upload.onprogress = test.step_func_done()
+    client.onload = test.unreached_func()
+    client.open("POST", url)
+    client.send("On time: " + url)
+  }, "Upload events registered on time (" + url + ")");
+});
+
+[remote, redirect].forEach(url => {
+  async_test(test => {
+    const client = new XMLHttpRequest();
+    client.onload = test.step_func_done();
+    client.open("POST", url);
+    client.send("Too late: " + url);
+    client.upload.onloadstart = test.unreached_func(); // registered too late
+    client.upload.onprogress = test.unreached_func(); // registered too late
+  }, "Upload events registered too late (" + url + ")");
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..4fdf53b
--- /dev/null
@@ -0,0 +1,6 @@
+
+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm
deleted file mode 100644 (file)
index 5acfc05..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-<html lang=en>
-<meta charset=utf-8>
-<title>XMLHttpRequest: upload progress event for cross-origin requests</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<div id="log"></div>
-<script>
-const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
-      redirect = "resources/redirect.py?code=307&location=" + remote;
-
-[remote, redirect].forEach(url => {
-  promise_test(async test => {
-    const client = new XMLHttpRequest();
-
-    const loadFinished = new Promise(resolve => client.onloadend = resolve);
-    const progressReceived = new Promise(resolve => client.upload.onprogress = resolve);
-    const loadReceived = new Promise((resolve, reject) => client.onload = () => { reject("load event received") });
-
-    const body = "On time: " + url;
-    client.open("POST", url);
-    client.send(body);
-
-    await Promise.race([progressReceived, loadReceived]);
-
-    await loadFinished;
-    assert_equals(client.getResponseHeader("X-Request-Data"), body, "test body");
-  }, "Upload events registered on time (" + url + ")");
-});
-
-[remote, redirect].forEach(url => {
-  promise_test(async test => {
-    const client = new XMLHttpRequest();
-
-    const loadFinished = new Promise(resolve => client.onloadend = resolve);
-    const loadReceived = new Promise(resolve => client.onload = resolve);
-
-    const body = "Too late: " + url;
-    client.open("POST", url);
-    client.send(body);
-
-    const loadstartReceived = new Promise((resolve, reject) => client.upload.onloadstart = () => { reject("loadstart event received") });
-    const progressReceived = new Promise((resolve, reject) => client.upload.onprogress = () => { reject("progress event received") });
-
-    await Promise.race([loadReceived, progressReceived, loadstartReceived]);
-
-    await loadFinished;
-    assert_equals(client.getResponseHeader("X-Request-Data"), body);
-  }, "Upload events registered too late (" + url + ")");
-});
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any-expected.txt
new file mode 100644 (file)
index 0000000..4fdf53b
--- /dev/null
@@ -0,0 +1,6 @@
+
+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
@@ -1,14 +1,8 @@
-<!doctype html>
-<html lang=en>
-<meta charset=utf-8>
-<title>XMLHttpRequest: upload progress event</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<div id="log"></div>
-<script>
+// META: title=XMLHttpRequest: upload progress event
+// META: script=/common/get-host-info.sub.js
+
 const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
-      redirect = "resources/redirect.py?code=307&location=" + remote;
+  redirect = "resources/redirect.py?code=307&location=" + remote;
 
 [remote, redirect].forEach(url => {
   async_test(test => {
@@ -29,5 +23,4 @@ const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.
     client.upload.onloadstart = test.unreached_func(); // registered too late
     client.upload.onprogress = test.unreached_func(); // registered too late
   }, "Upload events registered too late (" + url + ")");
-});
-</script>
+});
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..4fdf53b
--- /dev/null
@@ -0,0 +1,6 @@
+
+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
index 31c026a..e0ae6af 100644 (file)
@@ -1,6 +1,12 @@
 
+
+
+
+FAIL Constructors should throw a type error assert_throws: function "() => { new FormData(null); }" did not throw
 PASS empty formdata 
 PASS formdata with string 
 PASS formdata with named string 
 PASS formdata from form 
+FAIL Newly created FormData contains entries added to "formData" IDL attribute of FormDataEvent. assert_equals: expected (string) "vh1" but got (object) null
+FAIL |new FormData()| in formdata event handler should throw assert_equals: expected 1 but got 0
 
index f04616c..e7b5cf7 100644 (file)
@@ -12,5 +12,7 @@ PASS testFormDataSetToFormUndefined1
 PASS testFormDataSetToFormUndefined2 
 PASS testFormDataSetToFormNull1 
 PASS testFormDataSetToFormNull2 
+PASS testFormDataSetToFormString 
+PASS testFormDataSetToFormWrongPlatformObject 
 PASS testFormDataSetEmptyBlob 
 
index f030caa..ee43e15 100644 (file)
         assert_equals(fd.get('key'), "value1");
     }, 'testFormDataSetToFormNull2');
     test(function() {
+        var fd = new FormData(document.getElementById("form"));
+        assert_throws(new TypeError(), () => {fd.set('name', "string", 'filename')});
+    }, 'testFormDataSetToFormString');
+    test(function() {
+        var fd = new FormData(document.getElementById("form"));
+        assert_throws(new TypeError(), () => {fd.set('name', new URLSearchParams(), 'filename')});
+    }, 'testFormDataSetToFormWrongPlatformObject');
+    test(function() {
         var fd = new FormData();
         fd.set('key', new Blob([]), 'blank.txt');
         var file = fd.get('key');
index e0d0a4e..699c11a 100644 (file)
@@ -1,13 +1,16 @@
 <!doctype html>
 <html lang=en>
 <meta charset=utf-8>
-<title>XMLHttpRequest: upload formdata</title>
+<title>XMLHttpRequest: Construct and upload FormData</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/html/semantics/forms/form-submission-0/resources/targetted-form.js"></script>
     <link rel="help" href="https://xhr.spec.whatwg.org/#interface-formdata" data-tested-assertations="following::P[1]" />
     <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata" data-tested-assertations=".. following::P[1]" />
     <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-append" data-tested-assertations=".. following::UL[1]/LI[1] following::UL[1]/LI[2] following::UL[1]/LI[3]" />
     <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-FormData" data-tested-assertations="following::DD[1]" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#constructing-the-form-data-set">
+
 <div id="log"></div>
 <form id="form">
   <input type="hidden" name="key" value="value">
     return fd;
   }
 
+  test(() => {
+    assert_throws(new TypeError(), () => { new FormData(null); });
+    assert_throws(new TypeError(), () => { new FormData("string"); });
+  }, "Constructors should throw a type error");
+
   do_test("empty formdata", new FormData(), '\n');
   do_test("formdata with string", create_formdata(['key', 'value']), 'key=value,\n');
   do_test("formdata with named string", create_formdata(['key', new Blob(['value'], {type: 'text/plain'}), 'kv.txt']), '\nkey=kv.txt:text/plain:5,');
   do_test("formdata from form", new FormData(document.getElementById('form')), 'key=value,\n');
 
+  test(() => {
+    let form = populateForm('<input name=n1 value=v1>');
+    let formDataInEvent = null;
+    form.addEventListener('formdata', e => {
+      e.formData.append('h1', 'vh1');
+      formDataInEvent = e.formData;
+    });
+    let formData = new FormData(form);
+    assert_equals(formData.get('h1'), 'vh1');
+    assert_equals(formData.get('n1'), 'v1');
+    assert_not_equals(formData, formDataInEvent,
+                      '"formData" attribute should be different from the ' +
+                      'FromData object created by "new"');
+
+    formDataInEvent.append('later-key', 'later-value');
+    assert_false(formData.has('later-key'));
+  }, 'Newly created FormData contains entries added to "formData" IDL ' +
+     'attribute of FormDataEvent.');
+
+  test(() => {
+    let form = populateForm('<input name=n11 value=v11>');
+    let counter = 0;
+    form.addEventListener('formdata', e => {
+      ++counter;
+      assert_throws('InvalidStateError', () => { new FormData(e.target) });
+    });
+    new FormData(form);
+    assert_equals(counter, 1);
+
+    form.submit();
+    assert_equals(counter, 2);
+  }, '|new FormData()| in formdata event handler should throw');
 </script>
index 5c358cc..5b9081a 100644 (file)
@@ -1,5 +1,5 @@
 
-PASS XMLHttpRequest: getAllResponseHeaders() 
+FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n"
 PASS XMLHttpRequest: getAllResponseHeaders() 1 
 PASS XMLHttpRequest: getAllResponseHeaders() 2 
 PASS XMLHttpRequest: getAllResponseHeaders() 3 
index 72e27a5..759d6b6 100644 (file)
@@ -7,7 +7,7 @@
 async_test((t) => {
   const client = new XMLHttpRequest()
   client.onload = t.step_func_done(() => {
-    assert_equals(client.getAllResponseHeaders(), "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n")
+    assert_equals(client.getAllResponseHeaders(), "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n")
   })
   client.onerror = t.unreached_func("unexpected error")
   client.open("GET", "resources/headers.asis")
index f36f0ce..d45e52e 100644 (file)
@@ -1,6 +1,7 @@
 // META: global=sharedworker
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
+// META: timeout=long
 
 idl_test(
   ['xhr'],
index 9192154..87b2ad7 100644 (file)
@@ -1,3 +1,3 @@
 
-FAIL XMLHttpRequest: open() during abort processing - abort() called from onloadstart assert_array_equals: lengths differ, expected 9 got 7
+PASS XMLHttpRequest: open() during abort processing - abort() called from onloadstart 
 
index 5d80bab..706eb32 100644 (file)
@@ -13,8 +13,6 @@ async_test(t => {
         "onreadystatechange readyState before open() 4",
         "onreadystatechange readyState after open() 1",
         "onloadstart readyState 1",
-        "upload.onabort 1",
-        "upload.onloadend 1",
         "client.onabort 1",
         "readyState after abort() 1",
         "client.onload 4"
index db4b880..fef0dfe 100644 (file)
@@ -1,5 +1,6 @@
 <!doctype html>
 <title>XMLHttpRequest: overrideMimeType() and responseType = "blob"</title>
+<meta name="timeout" content="long">
 <meta charset="utf-8">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any-expected.txt
new file mode 100644 (file)
index 0000000..8ff1c8d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js
new file mode 100644 (file)
index 0000000..b3125b0
--- /dev/null
@@ -0,0 +1,12 @@
+async_test(t => {
+  const client = new XMLHttpRequest();
+  client.overrideMimeType('text/plain;charset=Shift-JIS');
+  client.onreadystatechange = t.step_func(() => {
+    if (client.readyState === 4) {
+      assert_equals( client.responseText, 'テスト' );
+      t.done();
+    }
+  });
+  client.open("GET", "resources/status.py?type="+encodeURIComponent('text/html;charset=iso-8859-1')+'&content=%83%65%83%58%83%67');
+  client.send( '' );
+}, "XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding");
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..8ff1c8d
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm
deleted file mode 100644 (file)
index 98dfe14..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding</title>
-    <meta charset="utf-8">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-      var test = async_test();
-      test.step(function() {
-        var client = new XMLHttpRequest();
-        client.overrideMimeType('text/plain;charset=Shift-JIS');
-        client.onreadystatechange = function() {
-          if (client.readyState !== 4) return;
-          assert_equals( client.responseText, 'テスト' );
-          test.done();
-        };
-        client.open("GET", "resources/status.py?type="+encodeURIComponent('text/html;charset=iso-8859-1')+'&content=%83%65%83%58%83%67');
-        client.send( '' );
-      });
-    </script>
-  </body>
-</html>
index 0c69c76..77b274e 100644 (file)
@@ -3,7 +3,10 @@ def main(request, response):
 
     # Allow simple requests, but deny preflight
     if request.method != "OPTIONS":
-        response.headers.set("Access-Control-Allow-Credentials", "true")
-        response.headers.set("Access-Control-Allow-Origin", request.headers.get("origin"))
+        if "origin" in request.headers:
+            response.headers.set("Access-Control-Allow-Credentials", "true")
+            response.headers.set("Access-Control-Allow-Origin", request.headers["origin"])
+        else:
+            response.status = 500
     else:
         response.status = 400
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/auth.py
new file mode 100644 (file)
index 0000000..8b66826
--- /dev/null
@@ -0,0 +1,10 @@
+import imp
+import os
+
+here = os.path.split(os.path.abspath(__file__))[0]
+
+def main(request, response):
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
+                                            "authentication.py"))
+    return auth.main(request, response)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/w3c-import.log
new file mode 100644 (file)
index 0000000..a75de0e
--- /dev/null
@@ -0,0 +1,17 @@
+The tests in this directory were imported from the W3C repository.
+Do NOT modify these tests directly in WebKit.
+Instead, create a pull request on the WPT github:
+       https://github.com/web-platform-tests/wpt
+
+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
+
+Do NOT modify or remove this file.
+
+------------------------------------------------------------------------
+Properties requiring vendor prefixes:
+None
+Property values requiring vendor prefixes:
+None
+------------------------------------------------------------------------
+List of files:
+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth10/auth.py
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/auth.py
new file mode 100644 (file)
index 0000000..8b66826
--- /dev/null
@@ -0,0 +1,10 @@
+import imp
+import os
+
+here = os.path.split(os.path.abspath(__file__))[0]
+
+def main(request, response):
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
+                                            "authentication.py"))
+    return auth.main(request, response)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/w3c-import.log
new file mode 100644 (file)
index 0000000..f286629
--- /dev/null
@@ -0,0 +1,17 @@
+The tests in this directory were imported from the W3C repository.
+Do NOT modify these tests directly in WebKit.
+Instead, create a pull request on the WPT github:
+       https://github.com/web-platform-tests/wpt
+
+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
+
+Do NOT modify or remove this file.
+
+------------------------------------------------------------------------
+Properties requiring vendor prefixes:
+None
+Property values requiring vendor prefixes:
+None
+------------------------------------------------------------------------
+List of files:
+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth11/auth.py
index f5bef5b..618d285 100644 (file)
@@ -11,9 +11,7 @@ def main(request, response):
             if token is not None:
                 request.server.stash.put(token, "1")
             status = (401, 'Unauthorized')
-            headers = [('WWW-Authenticate', 'Basic realm="test"'),
-                       ('XHR-USER', expected_user_name),
-                       ('SES-USER', session_user)]
+            headers = [('WWW-Authenticate', 'Basic realm="test"')]
             return status, headers, 'FAIL (should be transparent)'
     else:
         if request.server.stash.take(token) == "1":
index 5351d19..ccb46b6 100644 (file)
@@ -1,6 +1,17 @@
+# This handler is designed to verify that UAs correctly discard the body of
+# responses to HTTP HEAD requests. If the response body is written to a
+# separate TCP packet, then this behavior cannot be verified. This handler uses
+# the response writer to ensure that the body is transmitted in the same packet
+# as the headers. In this way, non-conforming UAs will consistently fail the
+# associated test.
+
 def main(request, response):
-    response.send_body_for_head_request = True
-    headers = [("Content-type", "text/plain")]
     content = request.method
 
-    return headers, content
+    response.add_required_headers = False
+    response.writer.write('''HTTP/1.1 200 OK
+Content-type: text/plain
+Content-Length: {}
+
+{}'''.format(len(content), content))
+    response.writer.flush()
index 94c662c..78e7494 100644 (file)
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>XMLHttpRequest: progress events grow response body size</title>
+    <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-progress-notifications')]/.. following::a[contains(@href,'#make-progress-notifications')]/../following:p[1]" />
index dbef27c..20b197d 100644 (file)
@@ -1,5 +1,5 @@
 
-FAIL domain assert_equals: expected (undefined) undefined but got (string) "localhost"
+PASS domain 
 PASS URL 
 PASS documentURI 
 PASS baseURI 
@@ -11,7 +11,7 @@ PASS location
 PASS defaultView 
 PASS body 
 PASS doctype 
-FAIL all assert_equals: expected undefined but got [object HTMLAllCollection]
+PASS all 
 PASS cookie 
 PASS Test document URL properties after redirect 
 PASS Test document URL properties of document with <base> after redirect 
index b008348..c27a448 100644 (file)
       var client = new XMLHttpRequest()
       client.open("GET", "resources/well-formed.xml", false)
       client.send(null)
-      var responseURL = new URL('resources/well-formed.xml', location.href).href
+      var responseURLObject = new URL('resources/well-formed.xml', location.href);
+      var responseURL = responseURLObject.href
+      var responseDomain = responseURLObject.hostname
       var expected = {
-        domain:undefined,
+        domain:responseDomain,
         URL:responseURL,
         documentURI:responseURL,
         baseURI:responseURL,
@@ -26,7 +28,7 @@
         defaultView:null,
         body:null,
         doctype:null,
-        all:undefined,
+        all:HTMLAllCollection,
         cookie:''
       }
 
 
       function runTest(name, value){
         test(function(){
-          assert_equals(client.responseXML[name], value)
+          if (name == "all") {
+            assert_equals(client.responseXML[name].__proto__, value.prototype)
+          } else {
+            assert_equals(client.responseXML[name], value)
+          }
         }, name)
       }
 
index 0daea78..61d1c98 100644 (file)
@@ -1,4 +1,4 @@
-Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth1/auth.py
+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth10/auth.py
 
 PASS XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure) 
 
index 070b2ba..68ad5e9 100644 (file)
@@ -16,7 +16,7 @@
           urlstart = 'www1.'+location.host + location.pathname.replace(/\/[^\/]*$/, '/')
         client.withCredentials = true
         user = token()
-        client.open("GET", location.protocol+'//'+urlstart + "resources/auth1/auth.py", false, user, 'pass')
+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth10/auth.py", false, user, 'pass')
         client.setRequestHeader("x-user", user)
         assert_throws("NetworkError", function(){ client.send(null) })
         assert_equals(client.responseText, '')
index 464d69c..38f1b20 100644 (file)
         var client = new XMLHttpRequest(),
           urlstart = location.host + location.pathname.replace(/\/[^\/]*$/, '/'),
           user = token()
-        client.open("GET", location.protocol+'//'+urlstart + "resources/auth1/auth.py", false, user, 'pass')
+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth11/auth.py", false, user, 'pass')
         client.setRequestHeader("x-user", user)
         client.send(null)
         // Repeat request but *without* credentials in the open() call.
         // Is the UA supposed to cache credentials from above request and use them? Yes.
-        client.open("GET", location.protocol+'//'+urlstart + "resources/auth1/auth.py", false)
+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth11/auth.py", false)
         client.setRequestHeader("x-user", user)
         client.send(null)
 
index ef3df33..a968bb3 100644 (file)
@@ -88,8 +88,8 @@
       )
       request(
         "text/plain;charset= utf-8",
-       "text/plain;charset=UTF-8",
-       "charset with leading space that is UTF-8 does change")
+        "text/plain;charset=UTF-8",
+        "charset with leading space that is UTF-8 does change")
       request(
         "text/plain;charset=utf-8 ;x=x",
         "text/plain;charset=utf-8 ;x=x",
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any-expected.txt
new file mode 100644 (file)
index 0000000..0253c32
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(arraybuffer) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.js
new file mode 100644 (file)
index 0000000..71933d0
--- /dev/null
@@ -0,0 +1,31 @@
+// META: title=XMLHttpRequest.send(arraybuffer)
+
+var test = async_test();
+test.step(function()
+{
+    var xhr = new XMLHttpRequest();
+    var buf = new ArrayBuffer(5);
+    var arr = new Uint8Array(buf);
+    arr[0] = 0x48;
+    arr[1] = 0x65;
+    arr[2] = 0x6c;
+    arr[3] = 0x6c;
+    arr[4] = 0x6f;
+
+    xhr.onreadystatechange = function()
+    {
+        if (xhr.readyState == 4)
+        {
+            test.step(function()
+            {
+                assert_equals(xhr.status, 200);
+                assert_equals(xhr.response, "Hello");
+
+                test.done();
+            });
+        }
+    };
+
+    xhr.open("POST", "./resources/content.py", true);
+    xhr.send(buf);
+});
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..0253c32
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(arraybuffer) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm
deleted file mode 100644 (file)
index 25c5d24..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[1]"/>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The send() method: ArrayBuffer data</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
-
-        test.step(function()
-        {
-            var xhr = new XMLHttpRequest();
-            var buf = new ArrayBuffer(5);
-            var arr = new Uint8Array(buf);
-            arr[0] = 0x48;
-            arr[1] = 0x65;
-            arr[2] = 0x6c;
-            arr[3] = 0x6c;
-            arr[4] = 0x6f;
-
-            xhr.onreadystatechange = function()
-            {
-                if (xhr.readyState == 4)
-                {
-                    test.step(function()
-                    {
-                        assert_equals(xhr.status, 200);
-                        assert_equals(xhr.response, "Hello");
-
-                        test.done();
-                    });
-                }
-            };
-
-            xhr.open("POST", "./resources/content.py", true);
-            xhr.send(buf);
-        });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any-expected.txt
new file mode 100644 (file)
index 0000000..7cb66e6
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(arraybufferview) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.js
new file mode 100644 (file)
index 0000000..a3985b4
--- /dev/null
@@ -0,0 +1,18 @@
+// META: title=XMLHttpRequest.send(arraybufferview)
+
+var test = async_test();
+test.step(function()
+{
+    var str = "Hello";
+    var bytes = str.split("").map(function(ch) { return ch.charCodeAt(0); });
+    var xhr = new XMLHttpRequest();
+    var arr = new Uint8Array(bytes);
+
+    xhr.onload = test.step_func_done(function() {
+        assert_equals(xhr.status, 200);
+        assert_equals(xhr.response, str);
+    });
+
+    xhr.open("POST", "./resources/content.py", true);
+    xhr.send(arr);
+});
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..7cb66e6
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(arraybufferview) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm
deleted file mode 100644 (file)
index 4de7e9e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[1]"/>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <title>XMLHttpRequest: The send() method: ArrayBufferView data</title>
-    <link rel="author" title="Ondrej Zara" href="mailto:ondrej.zara@gmail.com">
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
-
-        test.step(function()
-        {
-            var str = "Hello";
-            var bytes = str.split("").map(function(ch) { return ch.charCodeAt(0); });
-            var xhr = new XMLHttpRequest();
-            var arr = new Uint8Array(bytes);
-
-            xhr.onload = test.step_func_done(function() {
-                assert_equals(xhr.status, 200);
-                assert_equals(xhr.response, str);
-            });
-
-            xhr.open("POST", "./resources/content.py", true);
-            xhr.send(arr);
-        });
-    </script>
-</body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any-expected.txt
new file mode 100644 (file)
index 0000000..3a2fc33
--- /dev/null
@@ -0,0 +1,12 @@
+
+PASS sending a plain empty object 
+PASS sending the ES Math object 
+PASS sending a new XHR instance 
+PASS sending object that stringifies to undefined 
+PASS sending object that stringifies to null 
+PASS object that stringifies to query string 
+PASS object that stringifies to JSON string 
+PASS object whose valueOf() returns a document - ignore valueOf(), stringify 
+PASS object whose toString() returns a document, expected to throw 
+PASS object whose toString() throws, expected to throw 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.js
new file mode 100644 (file)
index 0000000..d98a4ca
--- /dev/null
@@ -0,0 +1,50 @@
+// META: title=XMLHttpRequest.send(ES object)
+
+function do_test(obj, expected, name) {
+  var test = async_test(name)
+  test.step(function() {
+    var client = new XMLHttpRequest()
+    client.onload = test.step_func(function () {
+      assert_equals(client.responseText, expected)
+      test.done()
+    });
+    client.open('POST', 'resources/content.py')
+    if (expected.exception) {
+      assert_throws(expected.exception, function(){client.send(obj)})
+      test.done()
+    } else {
+      client.send(obj)
+    }
+  });
+}
+
+do_test({}, '[object Object]', 'sending a plain empty object')
+do_test(Math, '[object Math]', 'sending the ES Math object')
+do_test(new XMLHttpRequest, '[object XMLHttpRequest]', 'sending a new XHR instance')
+do_test({toString:function(){}}, 'undefined', 'sending object that stringifies to undefined')
+do_test({toString:function(){return null}}, 'null', 'sending object that stringifies to null')
+var ancestor = {toString: function(){
+  var ar=[]
+  for (var prop in this) {
+    if (this.hasOwnProperty(prop)) {
+      ar.push(prop+'='+this[prop])
+    }
+  };
+  return ar.join('&')
+}};
+
+var myObj = Object.create(ancestor, {foo:{value:1, enumerable: true},  bar:{value:'foo', enumerable:true}})
+do_test(myObj, 'foo=1&bar=foo', 'object that stringifies to query string')
+
+var myFakeJSON = {a:'a', b:'b', toString:function(){ return JSON.stringify(this, function(key, val){ return key ==='toString'?undefined:val; }) }}
+do_test(myFakeJSON, '{"a":"a","b":"b"}', 'object that stringifies to JSON string')
+
+var myFakeDoc1 = {valueOf:function(){return document}}
+do_test(myFakeDoc1, '[object Object]', 'object whose valueOf() returns a document - ignore valueOf(), stringify')
+
+var myFakeDoc2 = {toString:function(){return document}}
+var expectedError = self.GLOBAL.isWorker() ? new ReferenceError() : new TypeError();
+do_test(myFakeDoc2, {exception:expectedError}, 'object whose toString() returns a document, expected to throw')
+
+var myThrower = {toString:function(){throw {name:'FooError', message:'bar'}}}
+do_test(myThrower, {exception:{name:'FooError'}}, 'object whose toString() throws, expected to throw')
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..3a2fc33
--- /dev/null
@@ -0,0 +1,12 @@
+
+PASS sending a plain empty object 
+PASS sending the ES Math object 
+PASS sending a new XHR instance 
+PASS sending object that stringifies to undefined 
+PASS sending object that stringifies to null 
+PASS object that stringifies to query string 
+PASS object that stringifies to JSON string 
+PASS object whose valueOf() returns a document - ignore valueOf(), stringify 
+PASS object whose toString() returns a document, expected to throw 
+PASS object whose toString() throws, expected to throw 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm
deleted file mode 100644 (file)
index 6f77432..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>XMLHttpRequest: passing objects to send()</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol/li[4]" />
-<link rel="help" href="https://heycam.github.io/webidl/#es-union" data-tested-assertations="following::ol/li[16]" />
-
-<div id="log"></div>
-
-<script>
-  function do_test(obj, expected, name) {
-    var test = async_test(name)
-    test.step(function() {
-      var client = new XMLHttpRequest()
-      client.onload = test.step_func(function () {
-        assert_equals(client.responseText, expected)
-        test.done()
-      });
-      client.open('POST', 'resources/content.py')
-      if (expected.exception) {
-        assert_throws(expected.exception, function(){client.send(obj)})
-        test.done()
-      } else {
-        client.send(obj)
-      }
-    });
-  }
-
-  do_test({}, '[object Object]', 'sending a plain empty object')
-  do_test(Math, '[object Math]', 'sending the ES Math object')
-  do_test(new XMLHttpRequest, '[object XMLHttpRequest]', 'sending a new XHR instance')
-  do_test({toString:function(){}}, 'undefined', 'sending object that stringifies to undefined')
-  do_test({toString:function(){return null}}, 'null', 'sending object that stringifies to null')
-  var ancestor = {toString: function(){
-    var ar=[]
-    for (var prop in this) {
-      if (this.hasOwnProperty(prop)) {
-        ar.push(prop+'='+this[prop])
-      }
-    };
-    return ar.join('&')
-  }};
-
-  var myObj = Object.create(ancestor, {foo:{value:1, enumerable: true},  bar:{value:'foo', enumerable:true}})
-  do_test(myObj, 'foo=1&bar=foo', 'object that stringifies to query string')
-
-  var myFakeJSON = {a:'a', b:'b', toString:function(){ return JSON.stringify(this, function(key, val){ return key ==='toString'?undefined:val; }) }}
-  do_test(myFakeJSON, '{"a":"a","b":"b"}', 'object that stringifies to JSON string')
-
-  var myFakeDoc1 = {valueOf:function(){return document}}
-  do_test(myFakeDoc1, '[object Object]', 'object whose valueOf() returns a document - ignore valueOf(), stringify')
-
-  var myFakeDoc2 = {toString:function(){return document}}
-  do_test(myFakeDoc2, {exception:new TypeError()}, 'object whose toString() returns a document, expected to throw')
-
-  var myThrower = {toString:function(){throw {name:'FooError', message:'bar'}}}
-  do_test(myThrower, {exception:{name:'FooError'}}, 'object whose toString() throws, expected to throw')
-
-
-</script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any-expected.txt
new file mode 100644 (file)
index 0000000..9c097a1
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(formdata) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.js
new file mode 100644 (file)
index 0000000..6ff0479
--- /dev/null
@@ -0,0 +1,21 @@
+// META: title=XMLHttpRequest.send(formdata)
+
+var test = async_test();
+test.step(function()
+{
+    var xhr = new XMLHttpRequest();
+    var form = new FormData();
+    form.append("id", "0");
+    form.append("value", "zero");
+
+    xhr.onreadystatechange = test.step_func(() => {
+        if (xhr.readyState == 4) {
+            assert_equals(xhr.status, 200);
+            assert_equals(xhr.response, "id:0;value:zero;");
+            test.done();
+        }
+    });
+
+    xhr.open("POST", "./resources/form.py", true);
+    xhr.send(form);
+});
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker-expected.txt
new file mode 100644 (file)
index 0000000..9c097a1
--- /dev/null
@@ -0,0 +1,3 @@
+
+PASS XMLHttpRequest.send(formdata) 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.any.worker.html
new file mode 100644 (file)
index 0000000..2382913
--- /dev/null
@@ -0,0