(chore) partial migration to jest

Open-Earth-Foundation · Sep 6, 2024 · 27ba6d6 · 27ba6d6
1 parent 9a18536
commit 27ba6d6
Show file tree

Hide file tree

Showing 20 changed files with 1,482 additions and 524 deletions.
diff --git a/app/jest.config.ts b/app/jest.config.ts
@@ -181,7 +181,7 @@ const config: JestConfigWithTsJest = {
   //   "**/__tests__/**/*.[jt]s?(x)",
   //   "**/?(*.)+(spec|test).[tj]s?(x)"
   // ],
-
+  testMatch: ["**/?(*.)+(jest).[tj]s?(x)"],
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
   // testPathIgnorePatterns: [
   //   "/node_modules/"

diff --git a/app/jest.setup.ts b/app/jest.setup.ts
@@ -1 +1 @@
-import "@/util/big_int_json.ts";
+import "@/util/big_int_json";
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -9,7 +9,7 @@
     "start": "next start",
     "lint": "next lint",
     "test": "npm run api:test & npm run e2e:test",
-    "api:test": "glob -c \"tsx --no-warnings --test\" \"./tests/**/*.test.ts\"",
+    "api:test": "glob -c \"tsx --no-warnings --test\" \"./tests/**/*.test.ts\" & npm run jest",
     "e2e:test": "npx playwright test",
     "e2e:debug": "playwright test --debug",
     "e2e:test:head": "npx playwright test -- --headed",
@@ -25,7 +25,7 @@
     "db:gen-migration": "sequelize-cli migration:generate --name",
     "db:gen-seed": "sequelize-cli seed:generate --name",
     "sync-catalogue": "tsx scripts/catalogue-sync.ts",
-    "ci:test": "tsx --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=lcov.info tests/**/*.test.ts",
+    "ci:test": "tsx --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=lcov.info tests/**/*.test.ts & npm run jest",
     "prettier": "npx prettier . --write",
     "email": "email dev --dir src/lib/emails",
     "create-admin": "tsx scripts/create-admin.ts"
@@ -122,7 +122,7 @@
     "sequelize-auto": "^0.8.8",
     "start-server-and-test": "^2.0.3",
     "storybook": "^8.2.7",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsx": "^4.7.0"
   },

diff --git a/app/src/util/api.ts b/app/src/util/api.ts
@@ -12,8 +12,6 @@ import { db } from "@/models";
 import { ValidationError } from "sequelize";
 import { ManualInputValidationError } from "@/lib/custom-errors/manual-input-error";
 
-import "@/util/big_int_json.ts";
-
 export type ApiResponse = NextResponse | StreamingTextResponse;
 
 export type NextHandler = (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import "@/util/big_int_json.ts";
		import "@/util/big_int_json";