Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 22:45:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision ac16628eb7eb601957382053011363d2bcf8ce44

Browse source
This commit is contained in:
WPT Sync Bot 2020-02-17 08:20:12 +00:00
parent ea7e753cea
commit 7e7c8873e4
4408 changed files with 664787 additions and 857286 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/wpt/web-platform-tests/fetch/api/abort/general.any.js
View file

@ -28,7 +28,7 @@ promise_test(async t => {
const fetchPromise = fetch('../resources/data.json', { signal });
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Aborting rejects with AbortError");
promise_test(async t => {
@ -44,7 +44,7 @@ promise_test(async t => {
mode: 'no-cors'
});
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Aborting rejects with AbortError - no-cors");
// Test that errors thrown from the request constructor take priority over abort errors.
@ -63,7 +63,7 @@ for (const { args, testName } of badRequestArgTests) {
// Add signal to 2nd arg
args[1] = args[1] || {};
args[1].signal = controller.signal;
await promise_rejects(t, new TypeError, fetch(...args));
await promise_rejects_js(t, TypeError, fetch(...args));
}
}, `TypeError from request constructor takes priority - ${testName}`);
}
@ -88,7 +88,7 @@ promise_test(async t => {
const fetchPromise = fetch(request);
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Signal on request object");
promise_test(async t => {
@ -101,7 +101,7 @@ promise_test(async t => {
const fetchPromise = fetch(requestFromRequest);
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Signal on request object created from request object");
promise_test(async t => {
@ -114,7 +114,7 @@ promise_test(async t => {
const fetchPromise = fetch(requestFromRequest);
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Signal on request object created from request object, with signal on second request");
promise_test(async t => {
@ -127,7 +127,7 @@ promise_test(async t => {
const fetchPromise = fetch(requestFromRequest);
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Signal on request object created from request object, with signal on second request overriding another");
promise_test(async t => {
@ -139,7 +139,7 @@ promise_test(async t => {
const fetchPromise = fetch(request, {method: 'POST'});
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}, "Signal retained after unrelated properties are overridden by fetch");
promise_test(async t => {
@ -205,7 +205,7 @@ for (const bodyMethod of BODY_METHODS) {
Promise.resolve().then(() => log.push('next-microtask'))
]);
await promise_rejects(t, "AbortError", bodyPromise);
await promise_rejects_dom(t, "AbortError", bodyPromise);
assert_array_equals(log, [`${bodyMethod}-reject`, 'next-microtask']);
}, `response.${bodyMethod}() rejects if already aborted`);
@ -252,7 +252,7 @@ promise_test(async t => {
}
for (const fetchPromise of fetches) {
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}
}, "Already aborted signal can be used for many fetches");
@ -278,7 +278,7 @@ promise_test(async t => {
}
for (const fetchPromise of fetches) {
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
}
}, "Signal can be used to abort other fetches, even if another fetch succeeded before aborting");
@ -366,7 +366,7 @@ for (const bodyMethod of BODY_METHODS) {
controller.abort();
await promise_rejects(t, "AbortError", bodyPromise);
await promise_rejects_dom(t, "AbortError", bodyPromise);
const start = Date.now();
@ -394,8 +394,8 @@ promise_test(async t => {
controller.abort();
await promise_rejects(t, "AbortError", reader.read());
await promise_rejects(t, "AbortError", reader.closed);
await promise_rejects_dom(t, "AbortError", reader.read());
await promise_rejects_dom(t, "AbortError", reader.closed);
// The connection won't close immediately, but it should close at some point:
const start = Date.now();
@ -425,8 +425,8 @@ promise_test(async t => {
controller.abort();
await promise_rejects(t, "AbortError", reader.read());
await promise_rejects(t, "AbortError", reader.closed);
await promise_rejects_dom(t, "AbortError", reader.read());
await promise_rejects_dom(t, "AbortError", reader.closed);
// The connection won't close immediately, but it should close at some point:
const start = Date.now();
@ -488,7 +488,7 @@ promise_test(async t => {
assert_equals(cancelReason.constructor, DOMException);
assert_equals(cancelReason.name, 'AbortError');
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
const fetchErr = await fetchPromise.catch(e => e);

8
tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
View file

@ -46,7 +46,7 @@
const fetchPromise = w.fetch('data.json', { signal });
await promise_rejects(t, "AbortError", fetchPromise);
await promise_rejects_dom(t, "AbortError", fetchPromise);
await w.fetch('data.json?no-abort');
@ -76,7 +76,7 @@
Promise.resolve().then(() => log.push('next-microtask'))
]);
await promise_rejects(t, "AbortError", bodyPromise);
await promise_rejects_dom(t, "AbortError", bodyPromise);
assert_array_equals(log, [`${bodyMethod}-reject`, 'next-microtask']);
}, `response.${bodyMethod}() rejects if already aborted`);
@ -97,8 +97,8 @@
controller.abort();
await promise_rejects(t, "AbortError", reader.read());
await promise_rejects(t, "AbortError", reader.closed);
await promise_rejects_dom(t, "AbortError", reader.read());
await promise_rejects_dom(t, "AbortError", reader.closed);
}, "Stream errors once aborted.");
</script>
</body>

2
tests/wpt/web-platform-tests/fetch/api/basic/error-after-response.html
View file

@ -14,7 +14,7 @@ function checkReader(test, reader, promiseToTest)
{
return reader.read().then((value) => {
validateBufferFromString(value.value, "TEST_CHUNK", "Should receive first chunk");
return promise_rejects(test, new TypeError(), promiseToTest(reader));
return promise_rejects_js(test, TypeError, promiseToTest(reader));
});
}

2
tests/wpt/web-platform-tests/fetch/api/basic/header-value-null-byte.any.js
View file

@ -1,5 +1,5 @@
// META: global=window,worker
promise_test(t => {
return promise_rejects(t, new TypeError(), fetch("../../../xhr/resources/parse-headers.py?my-custom-header="+encodeURIComponent("x\0x")));
return promise_rejects_js(t, TypeError, fetch("../../../xhr/resources/parse-headers.py?my-custom-header="+encodeURIComponent("x\0x")));
}, "Ensure fetch() rejects null bytes in headers");

2
tests/wpt/web-platform-tests/fetch/api/basic/integrity.sub.any.js
View file

@ -20,7 +20,7 @@ function integrity(desc, url, integrity, initRequestMode, shouldPass) {
}, desc);
} else {
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url, fetchRequestInit));
return promise_rejects_js(test, TypeError, fetch(url, fetchRequestInit));
}, desc);
}
}

2
tests/wpt/web-platform-tests/fetch/api/basic/mediasource.window.js
View file

@ -1,5 +1,5 @@
promise_test(t => {
const mediaSource = new MediaSource(),
mediaSourceURL = URL.createObjectURL(mediaSource);
return promise_rejects(t, new TypeError(), fetch(mediaSourceURL));
return promise_rejects_js(t, TypeError, fetch(mediaSourceURL));
}, "Cannot fetch blob: URL from a MediaSource");

2
tests/wpt/web-platform-tests/fetch/api/basic/mode-same-origin.any.js
View file

@ -9,7 +9,7 @@ function fetchSameOrigin(url, shouldPass) {
assert_equals(resp.type, "basic", "response type is basic");
});
else
return promise_rejects(test, new TypeError, fetch(url, {mode: "same-origin"}));
return promise_rejects_js(test, TypeError, fetch(url, {mode: "same-origin"}));
}, "Fetch "+ url + " with same-origin mode");
}

2
tests/wpt/web-platform-tests/fetch/api/basic/request-head.any.js
View file

@ -1,4 +1,4 @@
promise_test(function(test) {
var requestInit = {"method": "HEAD", "body": "test"};
return promise_rejects(test, new TypeError(), fetch(".", requestInit));
return promise_rejects_js(test, TypeError, fetch(".", requestInit));
}, "Fetch with HEAD with body");

30
tests/wpt/web-platform-tests/fetch/api/basic/request-upload.any.js
View file

@ -1,11 +1,12 @@
// META: script=../resources/utils.js
function testUpload(desc, url, method, createBody, expectedBody) {
var requestInit = {"method": method}
const requestInit = {"method": method}
promise_test(function(test){
let body = createBody();
if (body)
const body = createBody();
if (body) {
requestInit["body"] = body;
}
return fetch(url, requestInit).then(function(resp) {
return resp.text().then((text)=> {
assert_equals(text, expectedBody);
@ -16,15 +17,16 @@ function testUpload(desc, url, method, createBody, expectedBody) {
function testUploadFailure(desc, url, method, createBody) {
const requestInit = {"method": method};
promise_test(test => {
let body = createBody();
if (body)
promise_test(t => {
const body = createBody();
if (body) {
requestInit["body"] = body;
return promise_rejects(new TypeError(), fetch(url, requestInit));
}
return promise_rejects_js(t, TypeError, fetch(url, requestInit));
}, desc);
}
var url = RESOURCES_DIR + "echo-content.py"
const url = RESOURCES_DIR + "echo-content.py"
testUpload("Fetch with PUT with body", url,
"PUT",
@ -73,7 +75,7 @@ testUpload("Fetch with POST with Blob body with mime type", url,
testUpload("Fetch with POST with ReadableStream", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
const encoder = new TextEncoder();
controller.enqueue(encoder.encode("Test"));
controller.close();
@ -83,7 +85,7 @@ testUpload("Fetch with POST with ReadableStream", url,
testUploadFailure("Fetch with POST with ReadableStream containing String", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
controller.enqueue("Test");
controller.close();
}})
@ -91,7 +93,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing String", url,
testUploadFailure("Fetch with POST with ReadableStream containing null", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
controller.enqueue(null);
controller.close();
}})
@ -99,7 +101,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing null", url,
testUploadFailure("Fetch with POST with ReadableStream containing number", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
controller.enqueue(99);
controller.close();
}})
@ -107,7 +109,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing number", url,
testUploadFailure("Fetch with POST with ReadableStream containing ArrayBuffer", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
controller.enqueue(new ArrayBuffer());
controller.close();
}})
@ -115,7 +117,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing ArrayBuffer",
testUploadFailure("Fetch with POST with ReadableStream containing Blob", url,
"POST",
() => {
new ReadableStream({start: controller => {
return new ReadableStream({start: controller => {
controller.enqueue(new Blob());
controller.close();
}})

2
tests/wpt/web-platform-tests/fetch/api/basic/scheme-about.any.js
View file

@ -5,7 +5,7 @@ function checkNetworkError(url, method) {
const desc = "Fetching " + url.substring(0, 45) + " with method " + method + " is KO"
promise_test(function(test) {
var promise = fetch(url, { method: method });
return promise_rejects(test, new TypeError(), promise);
return promise_rejects_js(test, TypeError, promise);
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/basic/scheme-blob.sub.any.js
View file

@ -22,7 +22,7 @@ checkFetchResponse(URL.createObjectURL(blob), "Blob's data", "text/plain", blob
function checkKoUrl(url, method, desc) {
promise_test(function(test) {
var promise = fetch(url, {"method": method});
return promise_rejects(test, new TypeError(), promise);
return promise_rejects_js(test, TypeError, promise);
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/basic/scheme-data.any.js
View file

@ -35,7 +35,7 @@ function checkKoUrl(url, method, desc) {
var cut = (url.length >= 40) ? "[...]" : "";
desc = "Fetching [" + method + "] " + url.substring(0, 45) + cut + " is KO"
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url, {"method": method}));
return promise_rejects_js(test, TypeError, fetch(url, {"method": method}));
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/basic/scheme-others.sub.any.js
View file

@ -5,7 +5,7 @@ function checkKoUrl(url, desc) {
desc = "Fetching " + url.substring(0, 45) + " is KO"
promise_test(function(test) {
var promise = fetch(url);
return promise_rejects(test, new TypeError(), promise);
return promise_rejects_js(test, TypeError, promise);
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-basic.any.js
View file

@ -17,7 +17,7 @@ function cors(desc, origin) {
}, desc + " [no-cors mode]");
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url + RESOURCES_DIR + "top.txt", {"mode": "cors"}));
return promise_rejects_js(test, TypeError, fetch(url + RESOURCES_DIR + "top.txt", {"mode": "cors"}));
}, desc + " [server forbid CORS]");
promise_test(function(test) {

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js
View file

@ -5,7 +5,7 @@ function corsMultipleOrigins(originList) {
var url = "http://{{host}}:{{ports[http][1]}}" + dirname(location.pathname) + RESOURCES_DIR + "preflight.py";
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url + urlParameters));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters));
}, "Listing multiple origins is illegal: " + originList);
}
/* Actual origin */

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-origin.any.js
View file

@ -20,7 +20,7 @@ function corsOrigin(desc, baseURL, method, origin, shouldPass) {
assert_equals(resp.status, 200, "Response's status is 200");
});
} else {
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
}
});
}, desc);

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.js
View file

@ -20,7 +20,7 @@ function corsPreflightRedirect(desc, redirectUrl, redirectLocation, redirectStat
promise_test(function(test) {
return fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token).then(function(resp) {
assert_equals(resp.status, 200, "Clean stash response's status is 200");
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
});
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-star.any.js
View file

@ -27,7 +27,7 @@ function preflightTest(succeeds, withCredentials, allowMethod, allowHeader, useM
assert_equals(resp.headers.get("x-origin"), origin)
})
} else {
return promise_rejects(t, new TypeError(), fetch(testURL, requestInit))
return promise_rejects_js(t, TypeError, fetch(testURL, requestInit))
}
}, "CORS that " + (succeeds ? "succeeds" : "fails") + " with credentials: " + withCredentials + "; method: " + useMethod + " (allowed: " + allowMethod + "); header: " + useHeader + " (allowed: " + allowHeader + ")")
}

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-status.any.js
View file

@ -23,7 +23,7 @@ function corsPreflightStatus(desc, corsUrl, preflightStatus) {
assert_equals(resp.headers.get("x-did-preflight"), "1", "Preflight request has been made");
});
} else {
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
}
});
}, desc);

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-credentials.any.js
View file

@ -14,7 +14,7 @@ function corsRedirectCredentials(desc, redirectUrl, redirectLocation, redirectSt
if(locationCredentials === "") {
return result;
} else {
return promise_rejects(t, new TypeError(), result);
return promise_rejects_js(t, TypeError, result);
}
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.js
View file

@ -22,7 +22,7 @@ function corsRedirect(desc, redirectUrl, redirectLocation, redirectStatus, expec
promise_test(function(test) {
var uuid_token = token();
return fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token).then(function(resp) {
return promise_rejects(test, new TypeError(), fetch(redirectUrl + "?token=" + uuid_token + "&max_age=0" + urlParametersFailure, requestInit));
return promise_rejects_js(test, TypeError, fetch(redirectUrl + "?token=" + uuid_token + "&max_age=0" + urlParametersFailure, requestInit));
});
}, desc + " (preflight after redirection failure case)");
}

2
tests/wpt/web-platform-tests/fetch/api/cors/resources/corspreflight.js
View file

@ -49,7 +49,7 @@ function corsPreflight(desc, corsUrl, method, allowed, headers, safeHeaders) {
}
});
} else {
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit)).then(function(){
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit)).then(function(){
return fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token);
});
}

6
tests/wpt/web-platform-tests/fetch/api/headers/header-values-normalize.html
View file

@ -56,9 +56,9 @@ for(let i = 0; i < 0x21; i++) {
promise_test((t) => {
if(fail) {
return Promise.all([
promise_rejects(t, new TypeError(), fetch(url, { headers: {"val1": val1} })),
promise_rejects(t, new TypeError(), fetch(url, { headers: {"val2": val2} })),
promise_rejects(t, new TypeError(), fetch(url, { headers: {"val3": val3} }))
promise_rejects_js(t, TypeError, fetch(url, { headers: {"val1": val1} })),
promise_rejects_js(t, TypeError, fetch(url, { headers: {"val2": val2} })),
promise_rejects_js(t, TypeError, fetch(url, { headers: {"val3": val3} }))
])
} else {
return fetch(url, { headers: {"val1": val1, "val2": val2, "val3": val3} }).then((res) => {

2
tests/wpt/web-platform-tests/fetch/api/headers/header-values.html
View file

@ -15,7 +15,7 @@
assert_throws_dom("SyntaxError", () => xhr.setRequestHeader("value-test", val))
}, "XMLHttpRequest with value " + encodeURI(val) + " needs to throw")
promise_test(t => promise_rejects(t, new TypeError(), fetch("/", { headers: {"value-test": val} })), "fetch() with value " + encodeURI(val) + " needs to throw")
promise_test(t => promise_rejects_js(t, TypeError, fetch("/", { headers: {"value-test": val} })), "fetch() with value " + encodeURI(val) + " needs to throw")
})
// Valid values

2
tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.js
View file

@ -7,7 +7,7 @@ if (this.document === undefined) {
cspViolationUrl = RESOURCES_DIR + "top.txt";
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(cspViolationUrl));
return promise_rejects_js(test, TypeError, fetch(cspViolationUrl));
}, "Fetch is blocked by CSP, got a TypeError");
done();

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js
View file

@ -19,7 +19,7 @@ function redirectCount(desc, redirectUrl, redirectLocation, redirectStatus, maxC
assert_equals(resp.status, 200, "Clean stash response's status is 200");
if (!shouldPass)
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
return fetch(url + urlParameters, requestInit).then(function(resp) {
assert_equals(resp.status, 200, "Response's status is 200");

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js
View file

@ -6,7 +6,7 @@
const url = RESOURCES_DIR + 'redirect-empty-location.py';
promise_test(t => {
return promise_rejects(t, new TypeError(), fetch(url, {redirect:'follow'}));
return promise_rejects_js(t, TypeError, fetch(url, {redirect:'follow'}));
}, 'redirect response with empty Location, follow mode');
promise_test(t => {

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js
View file

@ -10,7 +10,7 @@ function redirectLocation(desc, redirectUrl, redirectLocation, redirectStatus, r
promise_test(function(test) {
if (redirectMode === "error" || !shouldPass)
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
if (redirectMode === "manual")
return fetch(url + urlParameters, requestInit).then(function(resp) {
assert_equals(resp.status, 0, "Response's status is 0");

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js
View file

@ -16,7 +16,7 @@ function testRedirect(origin, redirectStatus, redirectMode, corsMode) {
promise_test(function(test) {
if (redirectMode === "error" ||
(corsMode === "no-cors" && redirectMode !== "follow" && origin !== "same-origin"))
return promise_rejects(test, new TypeError(), fetch(url + urlParameters, requestInit));
return promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
if (redirectMode === "manual")
return fetch(url + urlParameters, requestInit).then(function(resp) {
assert_equals(resp.status, 0, "Response's status is 0");

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-schemes.html
View file

@ -17,7 +17,7 @@
];
tests.forEach(function(url) {
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url))
return promise_rejects_js(test, TypeError, fetch(url))
})
})
</script>

2
tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js
View file

@ -10,7 +10,7 @@ function redirectDataURL(desc, redirectUrl, mode) {
var requestInit = {"mode": mode};
promise_test(function(test) {
return promise_rejects(test, new TypeError(), fetch(url, requestInit));
return promise_rejects_js(test, TypeError, fetch(url, requestInit));
}, desc);
}

2
tests/wpt/web-platform-tests/fetch/api/request/request-bad-port.html
View file

@ -79,7 +79,7 @@
BLOCKED_PORTS_LIST.map(function(a){
promise_test(function(t){
return promise_rejects(t, new TypeError(), fetch("http://example.com:" + a))
return promise_rejects_js(t, TypeError, fetch("http://example.com:" + a))
}, 'Request on bad port ' + a + ' should throw TypeError.');
});
</script>

2
tests/wpt/web-platform-tests/fetch/api/request/request-consume-empty.html
View file

@ -62,7 +62,7 @@
}
function checkBodyFormDataError(test, request) {
return promise_rejects(test, new TypeError(), request.formData()).then(function() {
return promise_rejects_js(test, TypeError, request.formData()).then(function() {
assert_false(request.bodyUsed);
});
}

2
tests/wpt/web-platform-tests/fetch/api/request/request-consume.html
View file

@ -150,7 +150,7 @@
badJSONValues.forEach(function(value) {
promise_test(function(test) {
var request = new Request("", {"method": "POST", "body": value});
return promise_rejects(test, new SyntaxError(), request.json());
return promise_rejects_js(test, SyntaxError, request.json());
}, "Trying to consume bad JSON text as JSON: '" + value + "'");
});
</script>

2
tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.html
View file

@ -92,7 +92,7 @@
promise_test(function(test) {
assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
return promise_rejects(test, new TypeError(), bodyConsumed.blob());
return promise_rejects_js(test, TypeError, bodyConsumed.blob());
}, "Check consuming a disturbed request");
test(function() {

6
tests/wpt/web-platform-tests/fetch/api/request/request-keepalive-quota.html
View file

@ -54,7 +54,7 @@
// Test Quota + 1 Byte
subsetTestByKey("fast", promise_test, function(test) {
return promise_rejects(test, TypeError(), fetchKeepAliveRequest(noDelay, expectedQuota + 1));
return promise_rejects_js(test, TypeError, fetchKeepAliveRequest(noDelay, expectedQuota + 1));
}, 'A Keep-Alive fetch() with a body over the Quota Limit should reject.');
// Test the Quota becomes available upon promise completion.
@ -74,7 +74,7 @@
// Now create a single Byte request that will complete quicker.
const second = fetchKeepAliveRequest(standardDelay, 1 /* bodySize */).then(() => {
// We shouldn't be able to create a 2 Byte request right now as only 1 Byte should have freed up.
return promise_rejects(test, TypeError(), fetchKeepAliveRequest(noDelay, 2 /* bodySize */));
return promise_rejects_js(test, TypeError, fetchKeepAliveRequest(noDelay, 2 /* bodySize */));
}).then(() => {
// Now validate that we can send another Keep-Alive fetch for just 1 Byte.
return fetchKeepAliveRequest(noDelay, 1 /* bodySize */);
@ -88,7 +88,7 @@
// Fill our Quota then try to send a second fetch.
const p = fetchKeepAliveRequest(standardDelay, expectedQuota);
const q = promise_rejects(test, TypeError(), fetchKeepAliveRequest(noDelay, 1 /* bodySize */));
const q = promise_rejects_js(test, TypeError, fetchKeepAliveRequest(noDelay, 1 /* bodySize */));
return Promise.all([p, q]);
}, 'A Keep-Alive fetch() should not be allowed if the Quota is used up.');

2
tests/wpt/web-platform-tests/fetch/api/response/response-consume-empty.html
View file

@ -62,7 +62,7 @@
}
function checkBodyFormDataError(test, response) {
return promise_rejects(test, new TypeError(), response.formData()).then(function() {
return promise_rejects_js(test, TypeError, response.formData()).then(function() {
assert_false(response.bodyUsed);
});
}

2
tests/wpt/web-platform-tests/fetch/api/response/response-consume.html
View file

@ -138,7 +138,7 @@
}
function checkBodyFormDataError(test, response, expectedBody) {
return promise_rejects(test, new TypeError(), response.formData()).then(function() {
return promise_rejects_js(test, TypeError, response.formData()).then(function() {
assert_true(response.bodyUsed, "body as formData: bodyUsed turned true");
});
}

42
tests/wpt/web-platform-tests/fetch/api/response/response-error-from-stream.html
View file

@ -8,33 +8,31 @@
</head>
<body>
<script>
function CustomTestError() {
const error = Error();
error.name = 'custom-test-error';
return error;
}
function newStreamWithStartError() {
return new ReadableStream({
start(controller) {
controller.error(CustomTestError());
}
})
var err = new Error("Start error");
return [new ReadableStream({
start(controller) {
controller.error(err);
}
}),
err]
}
function newStreamWithPullError() {
return new ReadableStream({
pull(controller) {
controller.error(CustomTestError());
}
})
var err = new Error("Pull error");
return [new ReadableStream({
pull(controller) {
controller.error(err);
}
}),
err]
}
function runRequestPromiseTest(stream, responseReaderMethod, testDescription) {
function runRequestPromiseTest([stream, err], responseReaderMethod, testDescription) {
promise_test(test => {
return promise_rejects(
return promise_rejects_exactly(
test,
CustomTestError(),
err,
new Response(stream)[responseReaderMethod](),
'CustomTestError should propagate'
)
@ -43,11 +41,13 @@
promise_test(test => {
return promise_rejects(test, CustomTestError(), newStreamWithStartError().getReader().read(), 'CustomTestError should propagate')
var [stream, err] = newStreamWithStartError();
return promise_rejects_exactly(test, err, stream.getReader().read(), 'CustomTestError should propagate')
}, "ReadableStreamDefaultReader Promise receives ReadableStream start() Error")
promise_test(test => {
return promise_rejects(test, CustomTestError(), newStreamWithPullError().getReader().read(), 'CustomTestError should propagate')
var [stream, err] = newStreamWithPullError();
return promise_rejects_exactly(test, err, stream.getReader().read(), 'CustomTestError should propagate')
}, "ReadableStreamDefaultReader Promise receives ReadableStream pull() Error")

8
tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-2.html
View file

@ -21,25 +21,25 @@ function createResponseWithLockedReadableStream(callback) {
promise_test(function(test) {
return createResponseWithLockedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.blob());
return promise_rejects_js(test, TypeError, response.blob());
});
}, "Getting blob after getting a locked Response body");
promise_test(function(test) {
return createResponseWithLockedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.text());
return promise_rejects_js(test, TypeError, response.text());
});
}, "Getting text after getting a locked Response body");
promise_test(function(test) {
return createResponseWithLockedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.json());
return promise_rejects_js(test, TypeError, response.json());
});
}, "Getting json after getting a locked Response body");
promise_test(function(test) {
return createResponseWithLockedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.arrayBuffer());
return promise_rejects_js(test, TypeError, response.arrayBuffer());
});
}, "Getting arrayBuffer after getting a locked Response body");

8
tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-3.html
View file

@ -22,25 +22,25 @@ function createResponseWithDisturbedReadableStream(callback) {
promise_test(function(test) {
return createResponseWithDisturbedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.blob());
return promise_rejects_js(test, TypeError, response.blob());
});
}, "Getting blob after reading the Response body");
promise_test(function(test) {
return createResponseWithDisturbedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.text());
return promise_rejects_js(test, TypeError, response.text());
});
}, "Getting text after reading the Response body");
promise_test(function(test) {
return createResponseWithDisturbedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.json());
return promise_rejects_js(test, TypeError, response.json());
});
}, "Getting json after reading the Response body");
promise_test(function(test) {
return createResponseWithDisturbedReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.arrayBuffer());
return promise_rejects_js(test, TypeError, response.arrayBuffer());
});
}, "Getting arrayBuffer after reading the Response body");

8
tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-4.html
View file

@ -21,25 +21,25 @@ function createResponseWithCancelledReadableStream(callback) {
promise_test(function(test) {
return createResponseWithCancelledReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.blob());
return promise_rejects_js(test, TypeError, response.blob());
});
}, "Getting blob after cancelling the Response body");
promise_test(function(test) {
return createResponseWithCancelledReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.text());
return promise_rejects_js(test, TypeError, response.text());
});
}, "Getting text after cancelling the Response body");
promise_test(function(test) {
return createResponseWithCancelledReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.json());
return promise_rejects_js(test, TypeError, response.json());
});
}, "Getting json after cancelling the Response body");
promise_test(function(test) {
return createResponseWithCancelledReadableStream(function(response) {
return promise_rejects(test, new TypeError(), response.arrayBuffer());
return promise_rejects_js(test, TypeError, response.arrayBuffer());
});
}, "Getting arrayBuffer after cancelling the Response body");