mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 07:43:12 +09:00
Use native FormData in controller route tests
Node's FormData and Blob do what the form-data package did here, and fetch sets the multipart Content-Type header itself. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
41e3f50dbe
commit
c9db2fb29e
2 files changed
+10
-17
No files matched your search
@@ -46,7 +46,6 @@
|
|||||||
"@types/node": "catalog:",
|
"@types/node": "catalog:",
|
||||||
"c8": "^12.0.0",
|
"c8": "^12.0.0",
|
||||||
"express": "catalog:",
|
"express": "catalog:",
|
||||||
"form-data": "^4.0.6",
|
|
||||||
"jsonwebtoken": "catalog:",
|
"jsonwebtoken": "catalog:",
|
||||||
"mocha": "^11.8.0",
|
"mocha": "^11.8.0",
|
||||||
"oxlint": "^1.88.0",
|
"oxlint": "^1.88.0",
|
||||||
|
|||||||
+10
-16
@@ -1,6 +1,5 @@
|
|||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
import events from "node:events";
|
import events from "node:events";
|
||||||
import FormData from "form-data";
|
|
||||||
import http from "node:http";
|
import http from "node:http";
|
||||||
|
|
||||||
import { wait, expositionContentType } from "@clusterio/lib";
|
import { wait, expositionContentType } from "@clusterio/lib";
|
||||||
@@ -308,27 +307,25 @@ describe("controller/src/routes", function() {
|
|||||||
let form;
|
let form;
|
||||||
form = new FormData();
|
form = new FormData();
|
||||||
form.append("instance_id", "123");
|
form.append("instance_id", "123");
|
||||||
form.append("file", "totally a zip file", { filename: "test.zip", contentType: "text/plain" });
|
form.append("file", new Blob(["totally a zip file"], { type: "text/plain" }), "test.zip");
|
||||||
response = await fetch(endpoint, {
|
response = await fetch(endpoint, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"X-Access-Token": testToken,
|
"X-Access-Token": testToken,
|
||||||
...form.getHeaders(),
|
|
||||||
},
|
},
|
||||||
body: form.getBuffer(),
|
body: form,
|
||||||
});
|
});
|
||||||
assert.equal(response.status, 400);
|
assert.equal(response.status, 400);
|
||||||
assert.deepEqual(await response.json(), { request_errors: ["invalid file Content-Type"] });
|
assert.deepEqual(await response.json(), { request_errors: ["invalid file Content-Type"] });
|
||||||
form = new FormData();
|
form = new FormData();
|
||||||
form.append("file", "totally a zip file", { filename: "test.zip", contentType: "application/zip" });
|
form.append("file", new Blob(["totally a zip file"], { type: "application/zip" }), "test.zip");
|
||||||
form.append("instance_id", "123");
|
form.append("instance_id", "123");
|
||||||
response = await fetch(endpoint, {
|
response = await fetch(endpoint, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"X-Access-Token": testToken,
|
"X-Access-Token": testToken,
|
||||||
...form.getHeaders(),
|
|
||||||
},
|
},
|
||||||
body: form.getBuffer(),
|
body: form,
|
||||||
});
|
});
|
||||||
assert.equal(response.status, 400);
|
assert.equal(response.status, 400);
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
@@ -336,14 +333,13 @@ describe("controller/src/routes", function() {
|
|||||||
);
|
);
|
||||||
form = new FormData();
|
form = new FormData();
|
||||||
form.append("instance_id", "123");
|
form.append("instance_id", "123");
|
||||||
form.append("file", "totally a zip file", { filename: "test.txt", contentType: "application/zip" });
|
form.append("file", new Blob(["totally a zip file"], { type: "application/zip" }), "test.txt");
|
||||||
response = await fetch(endpoint, {
|
response = await fetch(endpoint, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"X-Access-Token": testToken,
|
"X-Access-Token": testToken,
|
||||||
...form.getHeaders(),
|
|
||||||
},
|
},
|
||||||
body: form.getBuffer(),
|
body: form,
|
||||||
});
|
});
|
||||||
assert.equal(response.status, 400);
|
assert.equal(response.status, 400);
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
@@ -351,14 +347,13 @@ describe("controller/src/routes", function() {
|
|||||||
);
|
);
|
||||||
form = new FormData();
|
form = new FormData();
|
||||||
form.append("instance_id", "invalid");
|
form.append("instance_id", "invalid");
|
||||||
form.append("file", "totally a zip file", { filename: "test.zip", contentType: "application/zip" });
|
form.append("file", new Blob(["totally a zip file"], { type: "application/zip" }), "test.zip");
|
||||||
response = await fetch(endpoint, {
|
response = await fetch(endpoint, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"X-Access-Token": testToken,
|
"X-Access-Token": testToken,
|
||||||
...form.getHeaders(),
|
|
||||||
},
|
},
|
||||||
body: form.getBuffer(),
|
body: form,
|
||||||
});
|
});
|
||||||
assert.equal(response.status, 400);
|
assert.equal(response.status, 400);
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
@@ -410,14 +405,13 @@ describe("controller/src/routes", function() {
|
|||||||
let form;
|
let form;
|
||||||
form = new FormData();
|
form = new FormData();
|
||||||
form.append("instance_id", "123");
|
form.append("instance_id", "123");
|
||||||
form.append("file", "totally a zip file", { filename: "test.zip", contentType: "application/zip" });
|
form.append("file", new Blob(["totally a zip file"], { type: "application/zip" }), "test.zip");
|
||||||
response = await fetch(endpoint, {
|
response = await fetch(endpoint, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"X-Access-Token": testToken,
|
"X-Access-Token": testToken,
|
||||||
...form.getHeaders(),
|
|
||||||
},
|
},
|
||||||
body: form.getBuffer(),
|
body: form,
|
||||||
});
|
});
|
||||||
assert.equal(response.status, 500);
|
assert.equal(response.status, 500);
|
||||||
assert.deepEqual(await response.json(), { errors: ["Something went wrong"], request_errors: [] });
|
assert.deepEqual(await response.json(), { errors: ["Something went wrong"], request_errors: [] });
|
||||||
|
|||||||
Reference in new issue
Block a user