xt/plain",
- "te@xt/plain",
- "te,xt/plain",
- "te;xt/plain",
- "te:xt/plain",
- "te\\xt/plain",
- "te\"xt/plain",
- "te/xt/plain",
- "te[xt/plain",
- "te]xt/plain",
- "te?xt/plain",
- "te=xt/plain",
- "te{xt/plain",
- "te}xt/plain",
- "te\x20xt/plain",
- "TEXT/PLAIN",
- "text/plain;charset = UTF-8",
- "text/plain;charset=UTF-8"
-];
-validTypes.forEach(function(type) {
- test_blob(function() {
- var blob = new Blob(["PASS"]);
- return blob.slice(0, 4, type);
- }, {
- expected: "PASS",
- type: type.toLowerCase(),
- desc: "Valid contentType (" + format_value(type) + ")"
- });
-});
diff --git a/test/fixtures/wpt/FileAPI/blob/Blob-stream-byob-crash.html b/test/fixtures/wpt/FileAPI/blob/Blob-stream-byob-crash.html
deleted file mode 100644
index 5992ed1396c..00000000000
--- a/test/fixtures/wpt/FileAPI/blob/Blob-stream-byob-crash.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
diff --git a/test/fixtures/wpt/FileAPI/blob/Blob-stream-sync-xhr-crash.html b/test/fixtures/wpt/FileAPI/blob/Blob-stream-sync-xhr-crash.html
deleted file mode 100644
index fe54fb615b1..00000000000
--- a/test/fixtures/wpt/FileAPI/blob/Blob-stream-sync-xhr-crash.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/test/fixtures/wpt/FileAPI/blob/Blob-stream.any.js b/test/fixtures/wpt/FileAPI/blob/Blob-stream.any.js
deleted file mode 100644
index 453144cac96..00000000000
--- a/test/fixtures/wpt/FileAPI/blob/Blob-stream.any.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// META: title=Blob Stream
-// META: script=../support/Blob.js
-// META: script=/common/gc.js
-'use strict';
-
-// Helper function that triggers garbage collection while reading a chunk
-// if perform_gc is true.
-async function read_and_gc(reader, perform_gc) {
- // Passing Uint8Array for byte streams; non-byte streams will simply ignore it
- const read_promise = reader.read(new Uint8Array(64));
- if (perform_gc) {
- await garbageCollect();
- }
- return read_promise;
-}
-
-// Takes in a ReadableStream and reads from it until it is done, returning
-// an array that contains the results of each read operation. If perform_gc
-// is true, garbage collection is triggered while reading every chunk.
-async function read_all_chunks(stream, { perform_gc = false, mode } = {}) {
- assert_true(stream instanceof ReadableStream);
- assert_true('getReader' in stream);
- const reader = stream.getReader({ mode });
-
- assert_true('read' in reader);
- let read_value = await read_and_gc(reader, perform_gc);
-
- let out = [];
- let i = 0;
- while (!read_value.done) {
- for (let val of read_value.value) {
- out[i++] = val;
- }
- read_value = await read_and_gc(reader, perform_gc);
- }
- return out;
-}
-
-promise_test(async () => {
- const blob = new Blob(["PASS"]);
- const stream = blob.stream();
- const chunks = await read_all_chunks(stream);
- for (let [index, value] of chunks.entries()) {
- assert_equals(value, "PASS".charCodeAt(index));
- }
-}, "Blob.stream()")
-
-promise_test(async () => {
- const blob = new Blob();
- const stream = blob.stream();
- const chunks = await read_all_chunks(stream);
- assert_array_equals(chunks, []);
-}, "Blob.stream() empty Blob")
-
-promise_test(async () => {
- const input_arr = [8, 241, 48, 123, 151];
- const typed_arr = new Uint8Array(input_arr);
- const blob = new Blob([typed_arr]);
- const stream = blob.stream();
- const chunks = await read_all_chunks(stream);
- assert_array_equals(chunks, input_arr);
-}, "Blob.stream() non-unicode input")
-
-promise_test(async() => {
- const input_arr = [8, 241, 48, 123, 151];
- const typed_arr = new Uint8Array(input_arr);
- let blob = new Blob([typed_arr]);
- const stream = blob.stream();
- blob = null;
- await garbageCollect();
- const chunks = await read_all_chunks(stream, { perform_gc: true });
- assert_array_equals(chunks, input_arr);
-}, "Blob.stream() garbage collection of blob shouldn't break stream " +
- "consumption")
-
-promise_test(async() => {
- const input_arr = [8, 241, 48, 123, 151];
- const typed_arr = new Uint8Array(input_arr);
- let blob = new Blob([typed_arr]);
- const chunksPromise = read_all_chunks(blob.stream());
- // It somehow matters to do GC here instead of doing `perform_gc: true`
- await garbageCollect();
- assert_array_equals(await chunksPromise, input_arr);
-}, "Blob.stream() garbage collection of stream shouldn't break stream " +
- "consumption")
-
-promise_test(async () => {
- const input_arr = [8, 241, 48, 123, 151];
- const typed_arr = new Uint8Array(input_arr);
- let blob = new Blob([typed_arr]);
- const stream = blob.stream();
- const chunks = await read_all_chunks(stream, { mode: "byob" });
- assert_array_equals(chunks, input_arr);
-}, "Reading Blob.stream() with BYOB reader")
diff --git a/test/fixtures/wpt/FileAPI/blob/Blob-text.any.js b/test/fixtures/wpt/FileAPI/blob/Blob-text.any.js
deleted file mode 100644
index d04fa97cffe..00000000000
--- a/test/fixtures/wpt/FileAPI/blob/Blob-text.any.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// META: title=Blob Text
-// META: script=../support/Blob.js
-'use strict';
-
-promise_test(async () => {
- const blob = new Blob(["PASS"]);
- const text = await blob.text();
- assert_equals(text, "PASS");
-}, "Blob.text()")
-
-promise_test(async () => {
- const blob = new Blob();
- const text = await blob.text();
- assert_equals(text, "");
-}, "Blob.text() empty blob data")
-
-promise_test(async () => {
- const blob = new Blob(["P", "A", "SS"]);
- const text = await blob.text();
- assert_equals(text, "PASS");
-}, "Blob.text() multi-element array in constructor")
-
-promise_test(async () => {
- const non_unicode = "\u0061\u030A";
- const input_arr = new TextEncoder().encode(non_unicode);
- const blob = new Blob([input_arr]);
- const text = await blob.text();
- assert_equals(text, non_unicode);
-}, "Blob.text() non-unicode")
-
-promise_test(async () => {
- const blob = new Blob(["PASS"], { type: "text/plain;charset=utf-16le" });
- const text = await blob.text();
- assert_equals(text, "PASS");
-}, "Blob.text() different charset param in type option")
-
-promise_test(async () => {
- const non_unicode = "\u0061\u030A";
- const input_arr = new TextEncoder().encode(non_unicode);
- const blob = new Blob([input_arr], { type: "text/plain;charset=utf-16le" });
- const text = await blob.text();
- assert_equals(text, non_unicode);
-}, "Blob.text() different charset param with non-ascii input")
-
-promise_test(async () => {
- const input_arr = new Uint8Array([192, 193, 245, 246, 247, 248, 249, 250, 251,
- 252, 253, 254, 255]);
- const blob = new Blob([input_arr]);
- const text = await blob.text();
- assert_equals(text, "\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd" +
- "\ufffd\ufffd\ufffd\ufffd");
-}, "Blob.text() invalid utf-8 input")
-
-promise_test(async () => {
- const input_arr = new Uint8Array([192, 193, 245, 246, 247, 248, 249, 250, 251,
- 252, 253, 254, 255]);
- const blob = new Blob([input_arr]);
- const text_results = await Promise.all([blob.text(), blob.text(),
- blob.text()]);
- for (let text of text_results) {
- assert_equals(text, "\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd" +
- "\ufffd\ufffd\ufffd\ufffd");
- }
-}, "Blob.text() concurrent reads")
diff --git a/test/fixtures/wpt/FileAPI/file/File-constructor-endings.html b/test/fixtures/wpt/FileAPI/file/File-constructor-endings.html
deleted file mode 100644
index 1282b6c5ac2..00000000000
--- a/test/fixtures/wpt/FileAPI/file/File-constructor-endings.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-File constructor: endings option
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/File-constructor.any.js b/test/fixtures/wpt/FileAPI/file/File-constructor.any.js
deleted file mode 100644
index 0b0185c40bf..00000000000
--- a/test/fixtures/wpt/FileAPI/file/File-constructor.any.js
+++ /dev/null
@@ -1,155 +0,0 @@
-// META: title=File constructor
-
-const to_string_obj = { toString: () => 'a string' };
-const to_string_throws = { toString: () => { throw new Error('expected'); } };
-
-test(function() {
- assert_true("File" in globalThis, "globalThis should have a File property.");
-}, "File interface object exists");
-
-test(t => {
- assert_throws_js(TypeError, () => new File(),
- 'Bits argument is required');
- assert_throws_js(TypeError, () => new File([]),
- 'Name argument is required');
-}, 'Required arguments');
-
-function test_first_argument(arg1, expectedSize, testName) {
- test(function() {
- var file = new File(arg1, "dummy");
- assert_true(file instanceof File);
- assert_equals(file.name, "dummy");
- assert_equals(file.size, expectedSize);
- assert_equals(file.type, "");
- // assert_false(file.isClosed); XXX: File.isClosed doesn't seem to be implemented
- assert_not_equals(file.lastModified, "");
- }, testName);
-}
-
-test_first_argument([], 0, "empty fileBits");
-test_first_argument(["bits"], 4, "DOMString fileBits");
-test_first_argument(["𝓽𝓮𝔁𝓽"], 16, "Unicode DOMString fileBits");
-test_first_argument([new String('string object')], 13, "String object fileBits");
-test_first_argument([new Blob()], 0, "Empty Blob fileBits");
-test_first_argument([new Blob(["bits"])], 4, "Blob fileBits");
-test_first_argument([new File([], 'world.txt')], 0, "Empty File fileBits");
-test_first_argument([new File(["bits"], 'world.txt')], 4, "File fileBits");
-test_first_argument([new ArrayBuffer(8)], 8, "ArrayBuffer fileBits");
-test_first_argument([new Uint8Array([0x50, 0x41, 0x53, 0x53])], 4, "Typed array fileBits");
-test_first_argument(["bits", new Blob(["bits"]), new Blob(), new Uint8Array([0x50, 0x41]),
- new Uint16Array([0x5353]), new Uint32Array([0x53534150])], 16, "Various fileBits");
-test_first_argument([12], 2, "Number in fileBits");
-test_first_argument([[1,2,3]], 5, "Array in fileBits");
-test_first_argument([{}], 15, "Object in fileBits"); // "[object Object]"
-if (globalThis.document !== undefined) {
- test_first_argument([document.body], 24, "HTMLBodyElement in fileBits"); // "[object HTMLBodyElement]"
-}
-test_first_argument([to_string_obj], 8, "Object with toString in fileBits");
-test_first_argument({[Symbol.iterator]() {
- let i = 0;
- return {next: () => [
- {done:false, value:'ab'},
- {done:false, value:'cde'},
- {done:true}
- ][i++]};
-}}, 5, 'Custom @@iterator');
-
-[
- 'hello',
- 0,
- null
-].forEach(arg => {
- test(t => {
- assert_throws_js(TypeError, () => new File(arg, 'world.html'),
- 'Constructor should throw for invalid bits argument');
- }, `Invalid bits argument: ${JSON.stringify(arg)}`);
-});
-
-test(t => {
- assert_throws_js(Error, () => new File([to_string_throws], 'name.txt'),
- 'Constructor should propagate exceptions');
-}, 'Bits argument: object that throws');
-
-
-function test_second_argument(arg2, expectedFileName, testName) {
- test(function() {
- var file = new File(["bits"], arg2);
- assert_true(file instanceof File);
- assert_equals(file.name, expectedFileName);
- }, testName);
-}
-
-test_second_argument("dummy", "dummy", "Using fileName");
-test_second_argument("dummy/foo", "dummy/foo",
- "No replacement when using special character in fileName");
-test_second_argument(null, "null", "Using null fileName");
-test_second_argument(1, "1", "Using number fileName");
-test_second_argument('', '', "Using empty string fileName");
-if (globalThis.document !== undefined) {
- test_second_argument(document.body, '[object HTMLBodyElement]', "Using object fileName");
-}
-
-// testing the third argument
-[
- {type: 'text/plain', expected: 'text/plain'},
- {type: 'text/plain;charset=UTF-8', expected: 'text/plain;charset=utf-8'},
- {type: 'TEXT/PLAIN', expected: 'text/plain'},
- {type: '𝓽𝓮𝔁𝓽/𝔭𝔩𝔞𝔦𝔫', expected: ''},
- {type: 'ascii/nonprintable\u001F', expected: ''},
- {type: 'ascii/nonprintable\u007F', expected: ''},
- {type: 'nonascii\u00EE', expected: ''},
- {type: 'nonascii\u1234', expected: ''},
- {type: 'nonparsable', expected: 'nonparsable'}
-].forEach(testCase => {
- test(t => {
- var file = new File(["bits"], "dummy", { type: testCase.type});
- assert_true(file instanceof File);
- assert_equals(file.type, testCase.expected);
- }, `Using type in File constructor: ${testCase.type}`);
-});
-test(function() {
- var file = new File(["bits"], "dummy", { lastModified: 42 });
- assert_true(file instanceof File);
- assert_equals(file.lastModified, 42);
-}, "Using lastModified");
-test(function() {
- var file = new File(["bits"], "dummy", { name: "foo" });
- assert_true(file instanceof File);
- assert_equals(file.name, "dummy");
-}, "Misusing name");
-test(function() {
- var file = new File(["bits"], "dummy", { unknownKey: "value" });
- assert_true(file instanceof File);
- assert_equals(file.name, "dummy");
-}, "Unknown properties are ignored");
-
-[
- 123,
- 123.4,
- true,
- 'abc'
-].forEach(arg => {
- test(t => {
- assert_throws_js(TypeError, () => new File(['bits'], 'name.txt', arg),
- 'Constructor should throw for invalid property bag type');
- }, `Invalid property bag: ${JSON.stringify(arg)}`);
-});
-
-[
- null,
- undefined,
- [1,2,3],
- /regex/,
- function() {}
-].forEach(arg => {
- test(t => {
- assert_equals(new File(['bits'], 'name.txt', arg).size, 4,
- 'Constructor should accept object-ish property bag type');
- }, `Unusual but valid property bag: ${arg}`);
-});
-
-test(t => {
- assert_throws_js(Error,
- () => new File(['bits'], 'name.txt', {type: to_string_throws}),
- 'Constructor should propagate exceptions');
-}, 'Property bag propagates exceptions');
diff --git a/test/fixtures/wpt/FileAPI/file/Worker-read-file-constructor.worker.js b/test/fixtures/wpt/FileAPI/file/Worker-read-file-constructor.worker.js
deleted file mode 100644
index 4e003b3c958..00000000000
--- a/test/fixtures/wpt/FileAPI/file/Worker-read-file-constructor.worker.js
+++ /dev/null
@@ -1,15 +0,0 @@
-importScripts("/resources/testharness.js");
-
-async_test(function() {
- var file = new File(["bits"], "dummy", { 'type': 'text/plain', lastModified: 42 });
- var reader = new FileReader();
- reader.onload = this.step_func_done(function() {
- assert_equals(file.name, "dummy", "file name");
- assert_equals(reader.result, "bits", "file content");
- assert_equals(file.lastModified, 42, "file lastModified");
- });
- reader.onerror = this.unreached_func("Unexpected error event");
- reader.readAsText(file);
-}, "FileReader in Worker");
-
-done();
diff --git a/test/fixtures/wpt/FileAPI/file/resources/echo-content-escaped.py b/test/fixtures/wpt/FileAPI/file/resources/echo-content-escaped.py
deleted file mode 100644
index 5370e1e46ac..00000000000
--- a/test/fixtures/wpt/FileAPI/file/resources/echo-content-escaped.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from wptserve.utils import isomorphic_encode
-
-# Outputs the request body, with controls and non-ASCII bytes escaped
-# (b"\n" becomes b"\\x0a"), and with backslashes doubled.
-# As a convenience, CRLF newlines are left as is.
-
-def escape_byte(byte):
- # Convert int byte into a single-char binary string.
- byte = bytes([byte])
- if b"\0" <= byte <= b"\x1F" or byte >= b"\x7F":
- return b"\\x%02x" % ord(byte)
- if byte == b"\\":
- return b"\\\\"
- return byte
-
-def main(request, response):
-
- headers = [(b"X-Request-Method", isomorphic_encode(request.method)),
- (b"X-Request-Content-Length", request.headers.get(b"Content-Length", b"NO")),
- (b"X-Request-Content-Type", request.headers.get(b"Content-Type", b"NO")),
- # Avoid any kind of content sniffing on the response.
- (b"Content-Type", b"text/plain; charset=UTF-8")]
-
- content = b"".join(map(escape_byte, request.body)).replace(b"\\x0d\\x0a", b"\r\n")
-
- return headers, content
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-controls.html b/test/fixtures/wpt/FileAPI/file/send-file-form-controls.html
deleted file mode 100644
index 6347065bcae..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-controls.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-Upload files named using controls
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-iso-2022-jp.html b/test/fixtures/wpt/FileAPI/file/send-file-form-iso-2022-jp.html
deleted file mode 100644
index c931c9be3ab..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-iso-2022-jp.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-Upload files in ISO-2022-JP form
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-punctuation.html b/test/fixtures/wpt/FileAPI/file/send-file-form-punctuation.html
deleted file mode 100644
index a6568e2e56e..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-punctuation.html
+++ /dev/null
@@ -1,226 +0,0 @@
-
-
-Upload files named using punctuation
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-utf-8.html b/test/fixtures/wpt/FileAPI/file/send-file-form-utf-8.html
deleted file mode 100644
index 1be44f4f4db..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-utf-8.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-Upload files in UTF-8 form
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-windows-1252.html b/test/fixtures/wpt/FileAPI/file/send-file-form-windows-1252.html
deleted file mode 100644
index 21b219ffd2d..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-windows-1252.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-Upload files in Windows-1252 form
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form-x-user-defined.html b/test/fixtures/wpt/FileAPI/file/send-file-form-x-user-defined.html
deleted file mode 100644
index 8d6605d86de..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form-x-user-defined.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-Upload files in x-user-defined form
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-form.html b/test/fixtures/wpt/FileAPI/file/send-file-form.html
deleted file mode 100644
index baa8d4286c5..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-form.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-Upload ASCII-named file in UTF-8 form
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-formdata-controls.any.js b/test/fixtures/wpt/FileAPI/file/send-file-formdata-controls.any.js
deleted file mode 100644
index e95d3aada44..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-formdata-controls.any.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// META: title=FormData: FormData: Upload files named using controls
-// META: script=../support/send-file-formdata-helper.js
- "use strict";
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-NUL-[\0].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-BS-[\b].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-VT-[\v].txt",
- });
-
- // These have characters that undergo processing in name=,
- // filename=, and/or value; formDataPostFileUploadTest postprocesses
- // expectedEncodedBaseName for these internally.
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-LF-[\n].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-LF-CR-[\n\r].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-CR-[\r].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-CR-LF-[\r\n].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-HT-[\t].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-FF-[\f].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-DEL-[\x7F].txt",
- });
-
- // The rest should be passed through unmodified:
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-ESC-[\x1B].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-SPACE-[ ].txt",
- });
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-formdata-punctuation.any.js b/test/fixtures/wpt/FileAPI/file/send-file-formdata-punctuation.any.js
deleted file mode 100644
index 987dba39aff..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-formdata-punctuation.any.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// META: title=FormData: FormData: Upload files named using punctuation
-// META: script=../support/send-file-formdata-helper.js
- "use strict";
-
- // These have characters that undergo processing in name=,
- // filename=, and/or value; formDataPostFileUploadTest postprocesses
- // expectedEncodedBaseName for these internally.
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-QUOTATION-MARK-[\x22].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: '"file-for-upload-in-form-double-quoted.txt"',
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-REVERSE-SOLIDUS-[\\].txt",
- });
-
- // The rest should be passed through unmodified:
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-EXCLAMATION-MARK-[!].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-DOLLAR-SIGN-[$].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-PERCENT-SIGN-[%].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-AMPERSAND-[&].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-APOSTROPHE-['].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-LEFT-PARENTHESIS-[(].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-RIGHT-PARENTHESIS-[)].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-ASTERISK-[*].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-PLUS-SIGN-[+].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-COMMA-[,].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-FULL-STOP-[.].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-SOLIDUS-[/].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-COLON-[:].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-SEMICOLON-[;].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-EQUALS-SIGN-[=].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-QUESTION-MARK-[?].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-CIRCUMFLEX-ACCENT-[^].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-LEFT-SQUARE-BRACKET-[[].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-RIGHT-SQUARE-BRACKET-[]].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-LEFT-CURLY-BRACKET-[{].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-VERTICAL-LINE-[|].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-RIGHT-CURLY-BRACKET-[}].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form-TILDE-[~].txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "'file-for-upload-in-form-single-quoted.txt'",
- });
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-formdata-utf-8.any.js b/test/fixtures/wpt/FileAPI/file/send-file-formdata-utf-8.any.js
deleted file mode 100644
index b8bd74c717a..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-formdata-utf-8.any.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// META: title=FormData: FormData: Upload files in UTF-8 fetch()
-// META: script=../support/send-file-formdata-helper.js
- "use strict";
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form.txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "x-user-defined",
- fileBaseName: "file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "windows-1252",
- fileBaseName: "file-for-upload-in-form-☺😂.txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "JIS X 0201 and JIS X 0208",
- fileBaseName: "file-for-upload-in-form-★星★.txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "Unicode",
- fileBaseName: "file-for-upload-in-form-☺😂.txt",
- });
-
- formDataPostFileUploadTest({
- fileNameSource: "Unicode",
- fileBaseName: `file-for-upload-in-form-${kTestChars}.txt`,
- });
diff --git a/test/fixtures/wpt/FileAPI/file/send-file-formdata.any.js b/test/fixtures/wpt/FileAPI/file/send-file-formdata.any.js
deleted file mode 100644
index e13a34828a0..00000000000
--- a/test/fixtures/wpt/FileAPI/file/send-file-formdata.any.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// META: title=FormData: Upload ASCII-named file in UTF-8 form
-// META: script=../support/send-file-formdata-helper.js
- "use strict";
-
- formDataPostFileUploadTest({
- fileNameSource: "ASCII",
- fileBaseName: "file-for-upload-in-form.txt",
- });
diff --git a/test/fixtures/wpt/FileAPI/fileReader.any.js b/test/fixtures/wpt/FileAPI/fileReader.any.js
deleted file mode 100644
index 2876dcb4ce3..00000000000
--- a/test/fixtures/wpt/FileAPI/fileReader.any.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// META: title=FileReader States
-
-'use strict';
-
-test(function () {
- assert_true(
- "FileReader" in globalThis,
- "globalThis should have a FileReader property.",
- );
-}, "FileReader interface object");
-
-test(function () {
- var fileReader = new FileReader();
- assert_true(fileReader instanceof FileReader);
-}, "no-argument FileReader constructor");
-
-var t_abort = async_test("FileReader States -- abort");
-t_abort.step(function () {
- var fileReader = new FileReader();
- assert_equals(fileReader.readyState, 0);
- assert_equals(fileReader.readyState, FileReader.EMPTY);
-
- var blob = new Blob();
- fileReader.readAsArrayBuffer(blob);
- assert_equals(fileReader.readyState, 1);
- assert_equals(fileReader.readyState, FileReader.LOADING);
-
- fileReader.onabort = this.step_func(function (e) {
- assert_equals(fileReader.readyState, 2);
- assert_equals(fileReader.readyState, FileReader.DONE);
- t_abort.done();
- });
- fileReader.abort();
- fileReader.onabort = this.unreached_func("abort event should fire sync");
-});
-
-var t_event = async_test("FileReader States -- events");
-t_event.step(function () {
- var fileReader = new FileReader();
-
- var blob = new Blob();
- fileReader.readAsArrayBuffer(blob);
-
- fileReader.onloadstart = this.step_func(function (e) {
- assert_equals(fileReader.readyState, 1);
- assert_equals(fileReader.readyState, FileReader.LOADING);
- });
-
- fileReader.onprogress = this.step_func(function (e) {
- assert_equals(fileReader.readyState, 1);
- assert_equals(fileReader.readyState, FileReader.LOADING);
- });
-
- fileReader.onloadend = this.step_func(function (e) {
- assert_equals(fileReader.readyState, 2);
- assert_equals(fileReader.readyState, FileReader.DONE);
- t_event.done();
- });
-});
diff --git a/test/fixtures/wpt/FileAPI/filelist-section/filelist.html b/test/fixtures/wpt/FileAPI/filelist-section/filelist.html
deleted file mode 100644
index b97dcde19f6..00000000000
--- a/test/fixtures/wpt/FileAPI/filelist-section/filelist.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
- FileAPI Test: filelist
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html b/test/fixtures/wpt/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html
deleted file mode 100644
index 2efaa059fa4..00000000000
--- a/test/fixtures/wpt/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
- FileAPI Test: filelist_multiple_selected_files
-
-
-
-
-
-
-
-
-
-
-
-
Test steps:
-
- - Download upload.txt, upload.zip to local.
- - Select the local two files (upload.txt, upload.zip) to run the test.
-
-
-
Test steps:
-
- - Download upload.txt to local.
- - Select the local upload.txt file to run the test.
-
-
File API manual IDL tests
-
- Either download upload.txt and select it below or select an
- arbitrary local file.
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/idlharness.any.js b/test/fixtures/wpt/FileAPI/idlharness.any.js
deleted file mode 100644
index 1744242b9f3..00000000000
--- a/test/fixtures/wpt/FileAPI/idlharness.any.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-// META: timeout=long
-
-'use strict';
-
-// https://w3c.github.io/FileAPI/
-
-idl_test(
- ['FileAPI'],
- ['dom', 'html', 'url'],
- idl_array => {
- idl_array.add_objects({
- Blob: ['new Blob(["TEST"])'],
- File: ['new File(["myFileBits"], "myFileName")'],
- FileReader: ['new FileReader()']
- });
- }
-);
diff --git a/test/fixtures/wpt/FileAPI/idlharness.html b/test/fixtures/wpt/FileAPI/idlharness.html
deleted file mode 100644
index 45e8684f002..00000000000
--- a/test/fixtures/wpt/FileAPI/idlharness.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- File API automated IDL tests (requiring dom)
-
-
-
-
-
-
-
-
- File API automated IDL tests
-
-
-
-
-
-
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/idlharness.worker.js b/test/fixtures/wpt/FileAPI/idlharness.worker.js
deleted file mode 100644
index 002aaed40a5..00000000000
--- a/test/fixtures/wpt/FileAPI/idlharness.worker.js
+++ /dev/null
@@ -1,17 +0,0 @@
-importScripts("/resources/testharness.js");
-importScripts("/resources/WebIDLParser.js", "/resources/idlharness.js");
-
-'use strict';
-
-// https://w3c.github.io/FileAPI/
-
-idl_test(
- ['FileAPI'],
- ['dom', 'html', 'url'],
- idl_array => {
- idl_array.add_objects({
- FileReaderSync: ['new FileReaderSync()']
- });
- }
-);
-done();
diff --git a/test/fixtures/wpt/FileAPI/progress-manual.html b/test/fixtures/wpt/FileAPI/progress-manual.html
deleted file mode 100644
index b2e03b3eb27..00000000000
--- a/test/fixtures/wpt/FileAPI/progress-manual.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-Process Events for FileReader
-
-
-
-
-Please choose one file through this input below.
-
-
-
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/Determining-Encoding.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/Determining-Encoding.any.js
deleted file mode 100644
index 5b69f7ed982..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/Determining-Encoding.any.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// META: title=FileAPI Test: Blob Determining Encoding
-
-var t = async_test("Blob Determing Encoding with encoding argument");
-t.step(function() {
- // string 'hello'
- var data = [0xFE,0xFF,0x00,0x68,0x00,0x65,0x00,0x6C,0x00,0x6C,0x00,0x6F];
- var blob = new Blob([new Uint8Array(data)]);
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hello", "The FileReader should read the ArrayBuffer through UTF-16BE.")
- }, reader);
-
- reader.readAsText(blob, "UTF-16BE");
-});
-
-var t = async_test("Blob Determing Encoding with type attribute");
-t.step(function() {
- var data = [0xFE,0xFF,0x00,0x68,0x00,0x65,0x00,0x6C,0x00,0x6C,0x00,0x6F];
- var blob = new Blob([new Uint8Array(data)], {type:"text/plain;charset=UTF-16BE"});
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hello", "The FileReader should read the ArrayBuffer through UTF-16BE.")
- }, reader);
-
- reader.readAsText(blob);
-});
-
-
-var t = async_test("Blob Determing Encoding with UTF-8 BOM");
-t.step(function() {
- var data = [0xEF,0xBB,0xBF,0x68,0x65,0x6C,0x6C,0xC3,0xB6];
- var blob = new Blob([new Uint8Array(data)]);
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hellö", "The FileReader should read the blob with UTF-8.");
- }, reader);
-
- reader.readAsText(blob);
-});
-
-var t = async_test("Blob Determing Encoding without anything implying charset.");
-t.step(function() {
- var data = [0x68,0x65,0x6C,0x6C,0xC3,0xB6];
- var blob = new Blob([new Uint8Array(data)]);
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hellö", "The FileReader should read the blob by default with UTF-8.");
- }, reader);
-
- reader.readAsText(blob);
-});
-
-var t = async_test("Blob Determing Encoding with UTF-16BE BOM");
-t.step(function() {
- var data = [0xFE,0xFF,0x00,0x68,0x00,0x65,0x00,0x6C,0x00,0x6C,0x00,0x6F];
- var blob = new Blob([new Uint8Array(data)]);
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hello", "The FileReader should read the ArrayBuffer through UTF-16BE.");
- }, reader);
-
- reader.readAsText(blob);
-});
-
-var t = async_test("Blob Determing Encoding with UTF-16LE BOM");
-t.step(function() {
- var data = [0xFF,0xFE,0x68,0x00,0x65,0x00,0x6C,0x00,0x6C,0x00,0x6F,0x00];
- var blob = new Blob([new Uint8Array(data)]);
- var reader = new FileReader();
-
- reader.onloadend = t.step_func_done (function(event) {
- assert_equals(this.result, "hello", "The FileReader should read the ArrayBuffer through UTF-16LE.");
- }, reader);
-
- reader.readAsText(blob);
-});
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js
deleted file mode 100644
index fc71c643481..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// META: title=FileReader event handler attributes
-
-var attributes = [
- "onloadstart",
- "onprogress",
- "onload",
- "onabort",
- "onerror",
- "onloadend",
-];
-attributes.forEach(function(a) {
- test(function() {
- var reader = new FileReader();
- assert_equals(reader[a], null,
- "event handler attribute should initially be null");
- }, "FileReader." + a + ": initial value");
-});
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-multiple-reads.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-multiple-reads.any.js
deleted file mode 100644
index 4b19c69b425..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/FileReader-multiple-reads.any.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// META: title=FileReader: starting new reads while one is in progress
-
-test(function() {
- var blob_1 = new Blob(['TEST000000001'])
- var blob_2 = new Blob(['TEST000000002'])
- var reader = new FileReader();
- reader.readAsText(blob_1)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
- assert_throws_dom("InvalidStateError", function () {
- reader.readAsText(blob_2)
- })
-}, 'test FileReader InvalidStateError exception for readAsText');
-
-test(function() {
- var blob_1 = new Blob(['TEST000000001'])
- var blob_2 = new Blob(['TEST000000002'])
- var reader = new FileReader();
- reader.readAsDataURL(blob_1)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
- assert_throws_dom("InvalidStateError", function () {
- reader.readAsDataURL(blob_2)
- })
-}, 'test FileReader InvalidStateError exception for readAsDataURL');
-
-test(function() {
- var blob_1 = new Blob(['TEST000000001'])
- var blob_2 = new Blob(['TEST000000002'])
- var reader = new FileReader();
- reader.readAsArrayBuffer(blob_1)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
- assert_throws_dom("InvalidStateError", function () {
- reader.readAsArrayBuffer(blob_2)
- })
-}, 'test FileReader InvalidStateError exception for readAsArrayBuffer');
-
-async_test(function() {
- var blob_1 = new Blob(['TEST000000001'])
- var blob_2 = new Blob(['TEST000000002'])
- var reader = new FileReader();
- var triggered = false;
- reader.onloadstart = this.step_func_done(function() {
- assert_false(triggered, "Only one loadstart event should be dispatched");
- triggered = true;
- assert_equals(reader.readyState, FileReader.LOADING,
- "readyState must be LOADING")
- assert_throws_dom("InvalidStateError", function () {
- reader.readAsArrayBuffer(blob_2)
- })
- });
- reader.readAsArrayBuffer(blob_1)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
-}, 'test FileReader InvalidStateError exception in onloadstart event for readAsArrayBuffer');
-
-async_test(function() {
- var blob_1 = new Blob(['TEST000000001'])
- var blob_2 = new Blob(['TEST000000002'])
- var reader = new FileReader();
- reader.onloadend = this.step_func_done(function() {
- assert_equals(reader.readyState, FileReader.DONE,
- "readyState must be DONE")
- reader.readAsArrayBuffer(blob_2)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
- });
- reader.readAsArrayBuffer(blob_1)
- assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING")
-}, 'test FileReader no InvalidStateError exception in loadend event handler for readAsArrayBuffer');
-
-async_test(function() {
- var blob_1 = new Blob([new Uint8Array(0x414141)]);
- var blob_2 = new Blob(['TEST000000002']);
- var reader = new FileReader();
- reader.onloadstart = this.step_func(function() {
- reader.abort();
- reader.onloadstart = null;
- reader.onloadend = this.step_func_done(function() {
- assert_equals('TEST000000002', reader.result);
- });
- reader.readAsText(blob_2);
- });
- reader.readAsText(blob_1);
-}, 'test abort and restart in onloadstart event for readAsText');
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_abort.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_abort.any.js
deleted file mode 100644
index c778ae55bb5..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_abort.any.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// META: title=FileAPI Test: filereader_abort
-
- test(function() {
- var readerNoRead = new FileReader();
- readerNoRead.abort();
- assert_equals(readerNoRead.readyState, readerNoRead.EMPTY);
- assert_equals(readerNoRead.result, null);
- }, "Aborting before read");
-
- promise_test(t => {
- var blob = new Blob(["TEST THE ABORT METHOD"]);
- var readerAbort = new FileReader();
-
- var eventWatcher = new EventWatcher(t, readerAbort,
- ['abort', 'loadstart', 'loadend', 'error', 'load']);
-
- // EventWatcher doesn't let us inspect the state after the abort event,
- // so add an extra event handler for that.
- readerAbort.addEventListener('abort', t.step_func(e => {
- assert_equals(readerAbort.readyState, readerAbort.DONE);
- }));
-
- readerAbort.readAsText(blob);
- return eventWatcher.wait_for('loadstart')
- .then(() => {
- assert_equals(readerAbort.readyState, readerAbort.LOADING);
- // 'abort' and 'loadend' events are dispatched synchronously, so
- // call wait_for before calling abort.
- var nextEvent = eventWatcher.wait_for(['abort', 'loadend']);
- readerAbort.abort();
- return nextEvent;
- })
- .then(() => {
- // https://www.w3.org/Bugs/Public/show_bug.cgi?id=24401
- assert_equals(readerAbort.result, null);
- assert_equals(readerAbort.readyState, readerAbort.DONE);
- });
- }, "Aborting after read");
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_error.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_error.any.js
deleted file mode 100644
index 98459620901..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_error.any.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// META: title=FileAPI Test: filereader_error
-
- async_test(function() {
- var blob = new Blob(["TEST THE ERROR ATTRIBUTE AND ERROR EVENT"]);
- var reader = new FileReader();
- assert_equals(reader.error, null, "The error is null when no error occurred");
-
- reader.onload = this.step_func(function(evt) {
- assert_unreached("Should not dispatch the load event");
- });
-
- reader.onloadend = this.step_func(function(evt) {
- assert_equals(reader.result, null, "The result is null");
- this.done();
- });
-
- reader.readAsText(blob);
- reader.abort();
- });
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_events.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_events.any.js
deleted file mode 100644
index ac692907d11..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_events.any.js
+++ /dev/null
@@ -1,19 +0,0 @@
-promise_test(async t => {
- var reader = new FileReader();
- var eventWatcher = new EventWatcher(t, reader, ['loadstart', 'progress', 'abort', 'error', 'load', 'loadend']);
- reader.readAsText(new Blob([]));
- await eventWatcher.wait_for('loadstart');
- // No progress event for an empty blob, as no data is loaded.
- await eventWatcher.wait_for('load');
- await eventWatcher.wait_for('loadend');
-}, 'events are dispatched in the correct order for an empty blob');
-
-promise_test(async t => {
- var reader = new FileReader();
- var eventWatcher = new EventWatcher(t, reader, ['loadstart', 'progress', 'abort', 'error', 'load', 'loadend']);
- reader.readAsText(new Blob(['a']));
- await eventWatcher.wait_for('loadstart');
- await eventWatcher.wait_for('progress');
- await eventWatcher.wait_for('load');
- await eventWatcher.wait_for('loadend');
-}, 'events are dispatched in the correct order for a non-empty blob');
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_file-manual.html b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_file-manual.html
deleted file mode 100644
index 702ca9afd7b..00000000000
--- a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_file-manual.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
- FileAPI Test: filereader_file
-
-
-
-
-
-
-
-
-
Test step:
-
- - Download blue-100x100.png to local.
- - Select the local file (blue-100x100.png) to run the test.
-
-
-
Test step:
-
- - Download blue-100x100.png to local.
- - Select the local file (blue-100x100.png) to run the test.
-
-
-
Test steps:
-
- - Download blue96x96.png to local.
- - Select the local file (blue96x96.png) to run the test.
-
-
-
Test steps:
-
- - Download blue96x96.png to local.
- - Select the local file (blue96x96.png) to run the test.
-
-
Pass/fail criteria:
-
Test passes if there is a filled blue square.
-
-
-
![]()
-
Test passes if there is a filled blue square.
-
-
- 
-
-
diff --git a/test/fixtures/wpt/FileAPI/url/url_xmlhttprequest_img.html b/test/fixtures/wpt/FileAPI/url/url_xmlhttprequest_img.html
deleted file mode 100644
index 468dcb086d7..00000000000
--- a/test/fixtures/wpt/FileAPI/url/url_xmlhttprequest_img.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-FileAPI Test: Creating Blob URL via XMLHttpRequest as image source
-
-
-
-
-Test passes if there is a filled blue square.
-
-
- ![]()
-
-
-
-
-
diff --git a/test/issue-2065.js b/test/issue-2065.js
index 14bca22d311..b84fe04085b 100644
--- a/test/issue-2065.js
+++ b/test/issue-2065.js
@@ -5,7 +5,8 @@ const { test, after } = require('node:test')
const { createServer } = require('node:http')
const { once } = require('node:events')
const { createReadStream } = require('node:fs')
-const { File, FormData, request } = require('..')
+const { FormData, request } = require('..')
+const { File } = require('node:buffer')
test('undici.request with a FormData body should set content-length header', async (t) => {
t = tspl(t, { plan: 1 })
diff --git a/test/types/formdata.test-d.ts b/test/types/formdata.test-d.ts
index 79058c4eff3..f066b5f997b 100644
--- a/test/types/formdata.test-d.ts
+++ b/test/types/formdata.test-d.ts
@@ -1,7 +1,7 @@
-import { Blob } from 'buffer'
+import { Blob, File } from 'buffer'
import { Readable } from 'stream'
import { expectAssignable, expectType } from 'tsd'
-import { File, FormData, SpecIterableIterator } from '../..'
+import { FormData, SpecIterableIterator } from '../..'
import Dispatcher from '../../types/dispatcher'
declare const dispatcherOptions: Dispatcher.DispatchOptions
diff --git a/test/types/index.test-d.ts b/test/types/index.test-d.ts
index 39e413c02c8..c4d0244f04a 100644
--- a/test/types/index.test-d.ts
+++ b/test/types/index.test-d.ts
@@ -1,5 +1,5 @@
import { expectAssignable } from 'tsd'
-import Undici, {Pool, Client, errors, fetch, Interceptable, RedirectHandler, DecoratorHandler, Headers, Response, Request, FormData, File, FileReader} from '../..'
+import Undici, {Pool, Client, errors, fetch, Interceptable, RedirectHandler, DecoratorHandler, Headers, Response, Request, FormData} from '../..'
import Dispatcher from "../../types/dispatcher";
expectAssignable(new Undici.Pool('', {}))
@@ -11,8 +11,6 @@ expectAssignable(Undici.Headers)
expectAssignable(Undici.Response)
expectAssignable(Undici.Request)
expectAssignable(Undici.FormData)
-expectAssignable(Undici.File)
-expectAssignable(Undici.FileReader)
expectAssignable(Undici.interceptors.dump())
expectAssignable(Undici.interceptors.redirect())
expectAssignable(Undici.interceptors.retry())
diff --git a/test/wpt/runner/worker.mjs b/test/wpt/runner/worker.mjs
index 62863447440..fd87189c1ee 100644
--- a/test/wpt/runner/worker.mjs
+++ b/test/wpt/runner/worker.mjs
@@ -5,7 +5,7 @@ import { setFlagsFromString } from 'node:v8'
import { runInNewContext, runInThisContext } from 'node:vm'
import { parentPort, workerData } from 'node:worker_threads'
import {
- fetch, File, FileReader, FormData, Headers, Request, Response, setGlobalOrigin
+ fetch, FormData, Headers, Request, Response, setGlobalOrigin
} from '../../../index.js'
import { CloseEvent } from '../../../lib/web/websocket/events.js'
import { WebSocket } from '../../../lib/web/websocket/websocket.js'
@@ -46,7 +46,7 @@ Object.defineProperties(globalThis, {
},
File: {
...globalPropertyDescriptors,
- value: buffer.File ?? File
+ value: buffer.File
},
FormData: {
...globalPropertyDescriptors,
@@ -64,10 +64,6 @@ Object.defineProperties(globalThis, {
...globalPropertyDescriptors,
value: Response
},
- FileReader: {
- ...globalPropertyDescriptors,
- value: FileReader
- },
WebSocket: {
...globalPropertyDescriptors,
value: WebSocket
diff --git a/test/wpt/server/server.mjs b/test/wpt/server/server.mjs
index cc6d4317048..8cd81b069ec 100644
--- a/test/wpt/server/server.mjs
+++ b/test/wpt/server/server.mjs
@@ -55,7 +55,6 @@ const server = createServer(async (req, res) => {
case '/interfaces/url.idl':
case '/interfaces/html.idl':
case '/interfaces/fetch.idl':
- case '/interfaces/FileAPI.idl':
case '/interfaces/websockets.idl':
case '/interfaces/referrer-policy.idl':
case '/xhr/resources/utf16-bom.json':
diff --git a/test/wpt/start-FileAPI.mjs b/test/wpt/start-FileAPI.mjs
deleted file mode 100644
index 012acd28a7a..00000000000
--- a/test/wpt/start-FileAPI.mjs
+++ /dev/null
@@ -1,28 +0,0 @@
-import { WPTRunner } from './runner/runner.mjs'
-import { join } from 'path'
-import { fileURLToPath } from 'url'
-import { fork } from 'child_process'
-import { on } from 'events'
-
-const serverPath = fileURLToPath(join(import.meta.url, '../server/server.mjs'))
-
-const child = fork(serverPath, [], {
- stdio: ['pipe', 'pipe', 'pipe', 'ipc']
-})
-
-child.stdout.pipe(process.stdout)
-child.stderr.pipe(process.stderr)
-child.on('exit', (code) => process.exit(code))
-
-for await (const [message] of on(child, 'message')) {
- if (message.server) {
- const runner = new WPTRunner('FileAPI', message.server)
- runner.run()
-
- runner.once('completion', () => {
- if (child.connected) {
- child.send('shutdown')
- }
- })
- }
-}
diff --git a/test/wpt/status/FileAPI.status.json b/test/wpt/status/FileAPI.status.json
deleted file mode 100644
index da7aa96c0c8..00000000000
--- a/test/wpt/status/FileAPI.status.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "file": {
- "File-constructor.any.js": {
- "flaky": [
- "Using type in File constructor: nonparsable"
- ]
- }
- },
- "blob": {
- "Blob-constructor.any.js": {
- "skip": true
- },
- "Blob-stream.any.js": {
- "note": "fails in node v18",
- "flaky": [
- "Reading Blob.stream() with BYOB reader"
- ]
- }
- },
- "url": {
- "url-with-xhr.any.js": {
- "skip": true
- },
- "url-with-fetch.any.js": {
- "note": "needs investigation",
- "fail": [
- "Only exact matches should revoke URLs, using fetch",
- "Revoke blob URL after creating Request, will fetch",
- "Revoke blob URL after creating Request, then clone Request, will fetch"
- ]
- },
- "url-format.any.js": {
- "fail": [
- "Origin of Blob URL matches our origin",
- "Blob URL parses correctly",
- "Origin of Blob URL matches our origin for Files"
- ]
- }
- },
- "reading-data-section": {
- "filereader_result.any.js": {
- "note": "has to do with html microtask queue being different than queueMicrotask",
- "skip": true
- },
- "filereader_events.any.js": {
- "note": "has to do with html microtask queue being different than queueMicrotask",
- "fail": [
- "events are dispatched in the correct order for an empty blob",
- "events are dispatched in the correct order for a non-empty blob"
- ]
- }
- },
- "idlharness.any.js": {
- "note": "These flaky tests only fail in < node v19; add in a way to mark them as such eventually",
- "flaky": [
- "Blob interface: attribute size",
- "Blob interface: attribute type",
- "Blob interface: operation slice(optional long long, optional long long, optional DOMString)",
- "Blob interface: operation stream()",
- "Blob interface: operation text()",
- "Blob interface: operation arrayBuffer()",
- "URL interface: operation createObjectURL((Blob or MediaSource))",
- "URL interface: operation revokeObjectURL(DOMString)"
- ],
- "fail": [
- "FileList interface: existence and properties of interface object",
- "FileList interface object length",
- "FileList interface object name",
- "FileList interface: existence and properties of interface prototype object",
- "FileList interface: existence and properties of interface prototype object's \"constructor\" property",
- "FileList interface: existence and properties of interface prototype object's @@unscopables property",
- "FileList interface: operation item(unsigned long)",
- "FileList interface: attribute length"
- ]
- }
-}
diff --git a/test/wpt/status/service-workers/cache-storage.status.json b/test/wpt/status/service-workers/cache-storage.status.json
index 3a94a5906ff..b97ac5e993e 100644
--- a/test/wpt/status/service-workers/cache-storage.status.json
+++ b/test/wpt/status/service-workers/cache-storage.status.json
@@ -21,7 +21,8 @@
"note": "requires https server; flaky is on windows only TODO(@KhafraDev) investigate it",
"fail": [
"cors-exposed header should be stored correctly.",
- "Cache.match ignores vary headers on opaque response."
+ "Cache.match ignores vary headers on opaque response.",
+ "Cache.match blob should be sliceable"
],
"flaky": [
"Cache.match invoked multiple times for the same Request/Response"
diff --git a/types/file.d.ts b/types/file.d.ts
deleted file mode 100644
index c695b7ab0ba..00000000000
--- a/types/file.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Based on https://github.com/octet-stream/form-data/blob/2d0f0dc371517444ce1f22cdde13f51995d0953a/lib/File.ts (MIT)
-///
-
-import { Blob } from 'buffer'
-
-export interface BlobPropertyBag {
- type?: string
- endings?: 'native' | 'transparent'
-}
-
-export interface FilePropertyBag extends BlobPropertyBag {
- /**
- * The last modified date of the file as the number of milliseconds since the Unix epoch (January 1, 1970 at midnight). Files without a known last modified date return the current date.
- */
- lastModified?: number
-}
-
-export declare class File extends Blob {
- /**
- * Creates a new File instance.
- *
- * @param fileBits An `Array` strings, or [`ArrayBuffer`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer), [`ArrayBufferView`](https://developer.mozilla.org/en-US/docs/Web/API/ArrayBufferView), [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) objects, or a mix of any of such objects, that will be put inside the [`File`](https://developer.mozilla.org/en-US/docs/Web/API/File).
- * @param fileName The name of the file.
- * @param options An options object containing optional attributes for the file.
- */
- constructor(fileBits: ReadonlyArray, fileName: string, options?: FilePropertyBag)
-
- /**
- * Name of the file referenced by the File object.
- */
- readonly name: string
-
- /**
- * The last modified date of the file as the number of milliseconds since the Unix epoch (January 1, 1970 at midnight). Files without a known last modified date return the current date.
- */
- readonly lastModified: number
-
- readonly [Symbol.toStringTag]: string
-}
diff --git a/types/filereader.d.ts b/types/filereader.d.ts
deleted file mode 100644
index f05d231b2ff..00000000000
--- a/types/filereader.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-///
-
-import { Blob } from 'buffer'
-import { DOMException, Event, EventInit, EventTarget } from './patch'
-
-export declare class FileReader {
- __proto__: EventTarget & FileReader
-
- constructor ()
-
- readAsArrayBuffer (blob: Blob): void
- readAsBinaryString (blob: Blob): void
- readAsText (blob: Blob, encoding?: string): void
- readAsDataURL (blob: Blob): void
-
- abort (): void
-
- static readonly EMPTY = 0
- static readonly LOADING = 1
- static readonly DONE = 2
-
- readonly EMPTY = 0
- readonly LOADING = 1
- readonly DONE = 2
-
- readonly readyState: number
-
- readonly result: string | ArrayBuffer | null
-
- readonly error: DOMException | null
-
- onloadstart: null | ((this: FileReader, event: ProgressEvent) => void)
- onprogress: null | ((this: FileReader, event: ProgressEvent) => void)
- onload: null | ((this: FileReader, event: ProgressEvent) => void)
- onabort: null | ((this: FileReader, event: ProgressEvent) => void)
- onerror: null | ((this: FileReader, event: ProgressEvent) => void)
- onloadend: null | ((this: FileReader, event: ProgressEvent) => void)
-}
-
-export interface ProgressEventInit extends EventInit {
- lengthComputable?: boolean
- loaded?: number
- total?: number
-}
-
-export declare class ProgressEvent {
- __proto__: Event & ProgressEvent
-
- constructor (type: string, eventInitDict?: ProgressEventInit)
-
- readonly lengthComputable: boolean
- readonly loaded: number
- readonly total: number
-}
diff --git a/types/formdata.d.ts b/types/formdata.d.ts
index e676b11ec34..50e5d37c724 100644
--- a/types/formdata.d.ts
+++ b/types/formdata.d.ts
@@ -1,7 +1,7 @@
// Based on https://github.com/octet-stream/form-data/blob/2d0f0dc371517444ce1f22cdde13f51995d0953a/lib/FormData.ts (MIT)
///
-import { File } from './file'
+import { File } from 'buffer'
import { SpecIterableIterator } from './fetch'
/**
diff --git a/types/index.d.ts b/types/index.d.ts
index f6be35cd9bf..5b540211df7 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -24,8 +24,6 @@ export * from './util'
export * from './cookies'
export * from './eventsource'
export * from './fetch'
-export * from './file'
-export * from './filereader'
export * from './formdata'
export * from './diagnostics-channel'
export * from './websocket'
@@ -64,8 +62,6 @@ declare namespace Undici {
var Response: typeof import('./fetch').Response;
var Request: typeof import('./fetch').Request;
var FormData: typeof import('./formdata').FormData;
- var File: typeof import('./file').File;
- var FileReader: typeof import('./filereader').FileReader;
var caches: typeof import('./cache').caches;
var interceptors: typeof import('./interceptors').default;
}
