From 26be2f9a1dcbcb1ecc5abb100b1920bb28597938 Mon Sep 17 00:00:00 2001 From: xnacly Date: Wed, 1 Sep 2021 22:10:44 +0200 Subject: fixed globalSetup for jest --- api/scripts/globalSetup.js | 14 ++++++++++++++ api/scripts/setup_test.js | 13 ------------- cdn/package-lock.json | 42 +++++++++++++++++++++++++----------------- 3 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 api/scripts/globalSetup.js delete mode 100644 api/scripts/setup_test.js diff --git a/api/scripts/globalSetup.js b/api/scripts/globalSetup.js new file mode 100644 index 00000000..76cd8e0d --- /dev/null +++ b/api/scripts/globalSetup.js @@ -0,0 +1,14 @@ +const fs = require("fs"); +const { FosscordServer } = require("../dist/Server"); +const Server = new FosscordServer({ port: 3001 }); +global.server = Server; +module.exports = async () => { + try { + fs.unlinkSync(`${__dirname}/../database.db`); + } catch {} + return await Server.start(); +}; + +// afterAll(async () => { +// return await Server.stop(); +// }); diff --git a/api/scripts/setup_test.js b/api/scripts/setup_test.js deleted file mode 100644 index 95bf2e40..00000000 --- a/api/scripts/setup_test.js +++ /dev/null @@ -1,13 +0,0 @@ -const fs = require("fs"); -const { FosscordServer } = require("../dist/Server"); -const Server = new FosscordServer({ port: 3001 }); -(async () => { - try { - fs.unlinkSync(`${__dirname}/database.db`); - } catch {} - return await Server.start(); -})(); - -// afterAll(async () => { -// return await Server.stop(); -// }); diff --git a/cdn/package-lock.json b/cdn/package-lock.json index 673395a5..a94f1409 100644 --- a/cdn/package-lock.json +++ b/cdn/package-lock.json @@ -53,26 +53,30 @@ "hasInstallScript": true, "license": "GPLV3", "dependencies": { - "ajv": "^8.5.0", + "ajv": "^8.6.2", "amqplib": "^0.8.0", + "class-validator": "^0.13.1", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", "jsonwebtoken": "^8.5.1", - "missing-native-js-functions": "^1.2.10", - "mongodb": "^3.6.9", - "mongoose": "^5.13.7", - "mongoose-autopopulate": "^0.12.3", + "lambert-server": "^1.2.10", + "missing-native-js-functions": "^1.2.11", "node-fetch": "^2.6.1", - "typescript": "^4.1.3" + "patch-package": "^6.4.7", + "pg": "^8.7.1", + "reflect-metadata": "^0.1.13", + "sqlite3": "^5.0.2", + "typeorm": "^0.2.37", + "typescript": "^4.4.2", + "typescript-json-schema": "^0.50.1" }, "devDependencies": { "@types/amqplib": "^0.8.1", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", "@types/node": "^14.17.9", - "@types/node-fetch": "^2.5.12" + "@types/node-fetch": "^2.5.12", + "jest": "^27.0.6" } }, "node_modules/@babel/code-frame": { @@ -5965,22 +5969,26 @@ "requires": { "@types/amqplib": "^0.8.1", "@types/jsonwebtoken": "^8.5.0", - "@types/mongodb": "^3.6.9", "@types/mongoose-autopopulate": "^0.10.1", - "@types/mongoose-lean-virtuals": "^0.5.1", "@types/node": "^14.17.9", "@types/node-fetch": "^2.5.12", - "ajv": "^8.5.0", + "ajv": "^8.6.2", "amqplib": "^0.8.0", + "class-validator": "^0.13.1", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", + "jest": "^27.0.6", "jsonwebtoken": "^8.5.1", - "missing-native-js-functions": "^1.2.10", - "mongodb": "^3.6.9", - "mongoose": "^5.13.7", - "mongoose-autopopulate": "^0.12.3", + "lambert-server": "^1.2.10", + "missing-native-js-functions": "^1.2.11", "node-fetch": "^2.6.1", - "typescript": "^4.1.3" + "patch-package": "^6.4.7", + "pg": "^8.7.1", + "reflect-metadata": "^0.1.13", + "sqlite3": "^5.0.2", + "typeorm": "^0.2.37", + "typescript": "^4.4.2", + "typescript-json-schema": "^0.50.1" } }, "@istanbuljs/load-nyc-config": { -- cgit 1.5.1