foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-08 07:16:56 -05:00
Code Issues Packages 1 Wiki Activity

fix(cli/fetch): response constructor default properties (#6650)

Browse source
This commit is contained in:
Marcos Casagrande 2020-07-06 03:37:18 +02:00 • committed by GitHub
parent 5b09e721d3
commit 3b4260dc54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/js/web/fetch.ts
View file

@ -34,14 +34,14 @@ export class Response extends Body.Body implements domTypes.Response {
const extraInit = responseData.get(init) || {}; const extraInit = responseData.get(init) || {};
let { type = "default", url = "" } = extraInit; let { type = "default", url = "" } = extraInit;
let status = (Number(init.status) || 0) ?? 200; let status = init.status === undefined ? 200 : Number(init.status || 0);
let statusText = init.statusText ?? ""; let statusText = init.statusText ?? "";
let headers = let headers =
init.headers instanceof Headers init.headers instanceof Headers
? init.headers ? init.headers
: new Headers(init.headers); : new Headers(init.headers);
if (init.status && (status < 200 || status > 599)) { if (init.status !== undefined && (status < 200 || status > 599)) {
throw new RangeError( throw new RangeError(
`The status provided (${init.status}) is outside the range [200, 599]` `The status provided (${init.status}) is outside the range [200, 599]`
); );
@ -117,7 +117,7 @@ export class Response extends Body.Body implements domTypes.Response {
this.statusText = statusText; this.statusText = statusText;
this.status = extraInit.status || status; this.status = extraInit.status || status;
this.headers = headers; this.headers = headers;
this.redirected = extraInit.redirected; this.redirected = extraInit.redirected || false;
this.type = type; this.type = type;
} }

72
cli/tests/unit/fetch_test.ts
View file

@ -851,42 +851,50 @@ unitTest(
} }
); );
unitTest( unitTest(function fetchResponseConstructorNullBody(): void {
{ perms: { net: true } }, const nullBodyStatus = [204, 205, 304];
function fetchResponseConstructorNullBody(): void {
const nullBodyStatus = [204, 205, 304];
for (const status of nullBodyStatus) { for (const status of nullBodyStatus) {
try { try {
new Response("deno", { status }); new Response("deno", { status });
fail("Response with null body status cannot have body"); fail("Response with null body status cannot have body");
} catch (e) { } catch (e) {
assert(e instanceof TypeError); assert(e instanceof TypeError);
assertEquals( assertEquals(
e.message, e.message,
"Response with null body status cannot have body" "Response with null body status cannot have body"
); );
}
} }
} }
); });
unitTest( unitTest(function fetchResponseConstructorInvalidStatus(): void {
{ perms: { net: true } }, const invalidStatus = [101, 600, 199, null, "", NaN];
function fetchResponseConstructorInvalidStatus(): void {
const invalidStatus = [101, 600, 199];
for (const status of invalidStatus) { for (const status of invalidStatus) {
try { try {
new Response("deno", { status }); // deno-lint-ignore ban-ts-comment
fail("Invalid status"); // @ts-ignore
} catch (e) { new Response("deno", { status });
assert(e instanceof RangeError); fail(`Invalid status: ${status}`);
assertEquals( } catch (e) {
e.message, assert(e instanceof RangeError);
`The status provided (${status}) is outside the range [200, 599]` assertEquals(
); e.message,
} `The status provided (${status}) is outside the range [200, 599]`
);
} }
} }
); });
unitTest(function fetchResponseEmptyConstructor(): void {
const response = new Response();
assertEquals(response.status, 200);
assertEquals(response.body, null);
assertEquals(response.type, "default");
assertEquals(response.url, "");
assertEquals(response.redirected, false);
assertEquals(response.ok, true);
assertEquals(response.bodyUsed, false);
assertEquals([...response.headers], []);
});