summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-08-30 15:05:23 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-08-30 15:08:18 +1000
commit16315a3170ec018a834e68360e06b506415446d2 (patch)
tree90cfe456040fce35b904e88462886e3c73a2f3f2 /tests
parentStart listening after database and config has been loaded (diff)
parentOop, deprecated typeorm call (diff)
downloadserver-16315a3170ec018a834e68360e06b506415446d2.tar.xz
Merge branch 'staging' into dev/Maddy/fix/listeningAfterDb
Diffstat (limited to '')
-rw-r--r--tests/User.test.js (renamed from util/tests/User.test.js)0
-rw-r--r--tests/antman.jpg (renamed from cdn/tests/antman.jpg)bin259112 -> 259112 bytes
-rw-r--r--tests/cdn_endpoints.test.js (renamed from cdn/tests/cdn_endpoints.test.js)96
-rw-r--r--tests/filestorage.test.js (renamed from cdn/tests/filestorage.test.js)0
-rw-r--r--tests/routes.test.ts (renamed from api/tests/routes.test.ts)22
-rw-r--r--tests/routes/auth/login.test.js (renamed from api/tests/routes/auth/login.test.js)0
-rw-r--r--tests/routes/auth/register.test.js (renamed from api/tests/routes/auth/register.test.js)0
-rw-r--r--tests/routes/ping.test.js (renamed from api/tests/routes/ping.test.js)0
-rw-r--r--tests/setupJest.js (renamed from util/tests/setupJest.js)6
9 files changed, 43 insertions, 81 deletions
diff --git a/util/tests/User.test.js b/tests/User.test.js

index c0852ebc..c0852ebc 100644 --- a/util/tests/User.test.js +++ b/tests/User.test.js
diff --git a/cdn/tests/antman.jpg b/tests/antman.jpg
index 56af9063..56af9063 100644 --- a/cdn/tests/antman.jpg +++ b/tests/antman.jpg
Binary files differdiff --git a/cdn/tests/cdn_endpoints.test.js b/tests/cdn_endpoints.test.js
index 5a543e54..5627bf40 100644 --- a/cdn/tests/cdn_endpoints.test.js +++ b/tests/cdn_endpoints.test.js
@@ -11,17 +11,12 @@ if (!process.env.STORAGE_PROVIDER) process.env.STORAGE_PROVIDER = "file"; if (process.env.STORAGE_PROVIDER === "file") { if (process.env.STORAGE_LOCATION) { if (!process.env.STORAGE_LOCATION.startsWith("/")) { - process.env.STORAGE_LOCATION = path.join( - __dirname, - "..", - process.env.STORAGE_LOCATION, - "/" - ); + process.env.STORAGE_LOCATION = path.join(__dirname, "..", process.env.STORAGE_LOCATION, "/"); } } else { process.env.STORAGE_LOCATION = path.join(__dirname, "..", "files", "/"); } - if(!fs.existsSync(process.env.STORAGE_LOCATION)) fs.mkdirSync(process.env.STORAGE_LOCATION, {recursive:true}); + if (!fs.existsSync(process.env.STORAGE_LOCATION)) fs.mkdirSync(process.env.STORAGE_LOCATION, { recursive: true }); } const { CDNServer } = require("../dist/Server"); const { Config } = require("@fosscord/util"); @@ -59,9 +54,7 @@ describe("/attachments", () => { }); describe("with signature specified, without file specified", () => { test("route should respond with 400", async () => { - const response = await request - .post("/attachments/123456789") - .set({ signature: Config.get().security.requestSignature }); + const response = await request.post("/attachments/123456789").set({ signature: Config.get().security.requestSignature }); expect(response.statusCode).toBe(400); }); }); @@ -72,9 +65,7 @@ describe("/attachments", () => { .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); expect(response.statusCode).toBe(200); - expect(response.headers["content-type"]).toEqual( - expect.stringContaining("json") - ); + expect(response.headers["content-type"]).toEqual(expect.stringContaining("json")); expect(response.body.url).toBeDefined(); }); }); @@ -86,11 +77,9 @@ describe("/attachments", () => { .post("/attachments/123456789") .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); - request - .get(response.body.url.replace("http://localhost:3003", "")) - .then((x) => { - expect(x.statusCode).toBe(200); - }); + request.get(response.body.url.replace("http://localhost:3003", "")).then((x) => { + expect(x.statusCode).toBe(200); + }); }); }); }); @@ -101,13 +90,9 @@ describe("/attachments", () => { .post("/attachments/123456789") .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); - request - .delete( - response.body.url.replace("http://localhost:3003", "") - ) - .then((x) => { - expect(x.body.success).toBeDefined(); - }); + request.delete(response.body.url.replace("http://localhost:3003", "")).then((x) => { + expect(x.body.success).toBeDefined(); + }); }); }); }); @@ -123,9 +108,7 @@ describe("/avatars", () => { }); describe("with signature specified, without file specified", () => { test("route should respond with 400", async () => { - const response = await request - .post("/avatars/123456789") - .set({ signature: Config.get().security.requestSignature }); + const response = await request.post("/avatars/123456789").set({ signature: Config.get().security.requestSignature }); expect(response.statusCode).toBe(400); }); }); @@ -136,9 +119,7 @@ describe("/avatars", () => { .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); expect(response.statusCode).toBe(200); - expect(response.headers["content-type"]).toEqual( - expect.stringContaining("json") - ); + expect(response.headers["content-type"]).toEqual(expect.stringContaining("json")); expect(response.body.url).toBeDefined(); }); }); @@ -150,11 +131,9 @@ describe("/avatars", () => { .post("/avatars/123456789") .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); - request - .get(response.body.url.replace("http://localhost:3003", "")) - .then((x) => { - expect(x.statusCode).toBe(200); - }); + request.get(response.body.url.replace("http://localhost:3003", "")).then((x) => { + expect(x.statusCode).toBe(200); + }); }); }); }); @@ -165,13 +144,9 @@ describe("/avatars", () => { .post("/avatars/123456789") .set({ signature: Config.get().security.requestSignature }) .attach("file", __dirname + "/antman.jpg"); - request - .delete( - response.body.url.replace("http://localhost:3003", "") - ) - .then((x) => { - expect(x.body.success).toBeDefined(); - }); + request.delete(response.body.url.replace("http://localhost:3003", "")).then((x) => { + expect(x.body.success).toBeDefined(); + }); }); }); }); @@ -187,35 +162,25 @@ describe("/external", () => { }); describe("with signature specified, without file specified", () => { test("route should respond with 400", async () => { - const response = await request - .post("/external") - .set({ signature: Config.get().security.requestSignature }); + const response = await request.post("/external").set({ signature: Config.get().security.requestSignature }); expect(response.statusCode).toBe(400); }); }); describe("with signature specified, with file specified ", () => { test("route should respond with Content-type: application/json, 200 and res.body.url", async () => { - const response = await request - .post("/external") - .set({ signature: Config.get().security.requestSignature }) - .send({ - url: "https://i.ytimg.com/vi_webp/TiXzhQr5AUc/mqdefault.webp", - }); + const response = await request.post("/external").set({ signature: Config.get().security.requestSignature }).send({ + url: "https://i.ytimg.com/vi_webp/TiXzhQr5AUc/mqdefault.webp" + }); expect(response.statusCode).toBe(200); - expect(response.headers["content-type"]).toEqual( - expect.stringContaining("json") - ); + expect(response.headers["content-type"]).toEqual(expect.stringContaining("json")); expect(response.body.id).toBeDefined(); }); }); describe("with signature specified, with falsy url specified ", () => { test("route should respond with 400", async () => { - const response = await request - .post("/external") - .set({ signature: Config.get().security.requestSignature }) - .send({ - url: "notavalidurl.123", - }); + const response = await request.post("/external").set({ signature: Config.get().security.requestSignature }).send({ + url: "notavalidurl.123" + }); expect(response.statusCode).toBe(400); }); }); @@ -223,12 +188,9 @@ describe("/external", () => { describe("GET", () => { describe("getting uploaded image by url returned by POST /avatars", () => { test("route should respond with 200", async () => { - let response = await request - .post("/external") - .set({ signature: Config.get().security.requestSignature }) - .send({ - url: "https://i.ytimg.com/vi_webp/TiXzhQr5AUc/mqdefault.webp", - }); + let response = await request.post("/external").set({ signature: Config.get().security.requestSignature }).send({ + url: "https://i.ytimg.com/vi_webp/TiXzhQr5AUc/mqdefault.webp" + }); request.get(`external/${response.body.id}`).then((x) => { expect(x.statusCode).toBe(200); }); diff --git a/cdn/tests/filestorage.test.js b/tests/filestorage.test.js
index 78036602..78036602 100644 --- a/cdn/tests/filestorage.test.js +++ b/tests/filestorage.test.js
diff --git a/api/tests/routes.test.ts b/tests/routes.test.ts
index 35d74a94..51c068b5 100644 --- a/api/tests/routes.test.ts +++ b/tests/routes.test.ts
@@ -1,13 +1,13 @@ // TODO: check every route based on route() parameters: https://github.com/fosscord/fosscord-server/issues/308 // TODO: check every route with different database engine -import getRouteDescriptions from "../jest/getRouteDescriptions"; -import { join } from "path"; -import fs from "fs"; +import { Channel, Event, events, Guild, User } from "@fosscord/util"; import Ajv from "ajv"; import addFormats from "ajv-formats"; +import fs from "fs"; import fetch from "node-fetch"; -import { Event, User, events, Guild, Channel } from "@fosscord/util"; +import { join } from "path"; +import getRouteDescriptions from "../jest/getRouteDescriptions"; const SchemaPath = join(__dirname, "..", "assets", "schemas.json"); const schemas = JSON.parse(fs.readFileSync(SchemaPath, { encoding: "utf8" })); @@ -23,10 +23,10 @@ export const ajv = new Ajv({ }); addFormats(ajv); -var token: string; -var user: User; -var guild: Guild; -var channel: Channel; +let token: string; +let user: User; +let guild: Guild; +let channel: Channel; const request = async (path: string, opts: any = {}): Promise<any> => { const response = await fetch(`http://localhost:3001/api${path}`, { @@ -41,7 +41,7 @@ const request = async (path: string, opts: any = {}): Promise<any> => { }); if (response.status === 204) return; - var data = await response.text(); + let data = await response.text(); try { data = JSON.parse(data); if (response.status >= 400) throw data; @@ -95,13 +95,13 @@ describe("Automatic unit tests with route description middleware", () => { } const urlPath = path.replace(":id", user.id).replace(":guild_id", guild.id).replace(":channel_id", channel.id) || route.test?.path; - var validate: any; + let validate: any; if (route.test.body) { validate = ajv.getSchema(route.test.body); if (!validate) return done(new Error(`Response schema ${route.test.body} not found`)); } - var body = ""; + let body = ""; let eventEmitted = Promise.resolve(); if (route.test.event) { diff --git a/api/tests/routes/auth/login.test.js b/tests/routes/auth/login.test.js
index d4b52444..d4b52444 100644 --- a/api/tests/routes/auth/login.test.js +++ b/tests/routes/auth/login.test.js
diff --git a/api/tests/routes/auth/register.test.js b/tests/routes/auth/register.test.js
index 5d7b4eaa..5d7b4eaa 100644 --- a/api/tests/routes/auth/register.test.js +++ b/tests/routes/auth/register.test.js
diff --git a/api/tests/routes/ping.test.js b/tests/routes/ping.test.js
index 6fa4b160..6fa4b160 100644 --- a/api/tests/routes/ping.test.js +++ b/tests/routes/ping.test.js
diff --git a/util/tests/setupJest.js b/tests/setupJest.js
index 35a3cb52..bb52525f 100644 --- a/util/tests/setupJest.js +++ b/tests/setupJest.js
@@ -7,7 +7,7 @@ const path = require("path"); global.expect.extend({ toBeFasterThan: async (func, target) => { const start = performance.now(); - var error; + let error; try { await func(); } catch (e) { @@ -17,7 +17,7 @@ global.expect.extend({ return { pass: time < target && !error, - message: () => error || `${func.name} took ${time}ms of maximum ${target}`, + message: () => error || `${func.name} took ${time}ms of maximum ${target}` }; - }, + } });