diff --git a/README.md b/README.md index 0e6ab14..ae36927 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,12 @@ The backend server has a separate ingress, so API requests can get forwarded to The frontend server is running inside the pod on the address http://localhost:8080/iching. It provides an HTML homepage with a button. Upon pressing the button, the backend server will be called (to send an E-Mail). The frontend server has a separate ingress from the backend server, since the frontend server needs the 'rewrite target' annotation: So the Frontend is not running in the root folder but using the sub-path 'iching'. - - ## Running the App diff --git a/backend/broker.test.ts b/backend/broker.test.ts index c4232d1..555a47a 100644 --- a/backend/broker.test.ts +++ b/backend/broker.test.ts @@ -1,5 +1,5 @@ -/*import { html } from "./broker"; -import { test } from "@jest/globals"; +import { html } from "./broker"; +//import { test } from "@jest/globals"; jest.useFakeTimers(); @@ -17,4 +17,3 @@ test("Generate HTML for images", () => { expect(html("Images:\nOver the earth, the lake:\nThe image of Gathering Together.\nThus the superior man renews his weapons\nIn order to meet the unforseen.")) .toBe("

Images:

Over the earth, the lake:
The image of Gathering Together.
Thus the superior man renews his weapons
In order to meet the unforseen.

"); }); -*/ \ No newline at end of file diff --git a/jest.config.ts b/old.jest.config.ts similarity index 100% rename from jest.config.ts rename to old.jest.config.ts diff --git a/package.json b/package.json index 4bfb90a..ce50417 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,7 @@ "version": "1.0.0", "main": "broker.js", "scripts": { - "test": "jest --no-cache --force-exit", - "start:local": "tsc -p tsconfig.backend.json && tsc -p tsconfig.frontend.json && DEPLOY_MODE=local node dist/backend/server.js & npx http-server dist/frontend -p 8080 --cors --mime application/javascript=js" + "test": "jest --no-cache --force-exit" }, "keywords": [], "author": "", @@ -25,5 +24,9 @@ "express": "^5.1.0", "http-server": "^14.1.1", "nodemailer": "^6.10.0" - } + }, + "jest": { + "preset": "ts-jest", + "testEnvironment": "node" + } } diff --git a/tsconfig.backend.json b/tsconfig.backend.json index db21beb..c5bc144 100644 --- a/tsconfig.backend.json +++ b/tsconfig.backend.json @@ -8,7 +8,6 @@ "esModuleInterop": true, "skipLibCheck": true }, - "include": [ - "backend/**/*.ts" - ] + "include": ["backend/**/*.ts"], + "exclude": ["backend/**/*.test.ts"] } \ No newline at end of file