Refactor and separate tests from Jest and Playwright

sgcarstrends · Nov 9, 2024 · 6fc1dfb · 6fc1dfb
1 parent da0c3cc
commit 6fc1dfb
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 3 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -7,6 +7,11 @@ const createJestConfig = nextJest({ dir: "./" });
 const customJestConfig = {
   collectCoverage: true,
   setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
+  testMatch: [
+    "<rootDir>/tests/**/*.test.{js,jsx,ts,tsx}",
+    "<rootDir>/src/**/*.test.{js,jsx,ts,tsx}",
+    "!<rootDir>/e2e/**/*",
+  ],
 };
 
 // createJestConfig is exported in this way to ensure that next/jest can load the Next.js configuration, which is async

diff --git a/utils/capitaliseWords.test.ts → tests/capitaliseWords.test.ts b/utils/capitaliseWords.test.ts → tests/capitaliseWords.test.ts
diff --git a/utils/fetchApi.test.ts → tests/fetchApi.test.ts b/utils/fetchApi.test.ts → tests/fetchApi.test.ts
diff --git a/utils/formatDateToMonthYear.test.ts → tests/formatDateToMonthYear.test.ts b/utils/formatDateToMonthYear.test.ts → tests/formatDateToMonthYear.test.ts
@@ -1,4 +1,4 @@
-import { formatDateToMonthYear } from "./formatDateToMonthYear";
+import { formatDateToMonthYear } from "../utils/formatDateToMonthYear";
 
 describe("formatDateToMonthYear", () => {
   it("should return the formatted dates correctly", () => {

diff --git a/utils/formatOrdinal.test.ts → tests/formatOrdinal.test.ts b/utils/formatOrdinal.test.ts → tests/formatOrdinal.test.ts
@@ -1,4 +1,4 @@
-import { formatOrdinal } from "./formatOrdinal";
+import { formatOrdinal } from "../utils/formatOrdinal";
 
 describe("formatOrdinal", () => {
   it("should format basic ordinals correctly", () => {

diff --git a/utils/formatPercent.test.ts → tests/formatPercent.test.ts b/utils/formatPercent.test.ts → tests/formatPercent.test.ts
diff --git a/utils/getUniqueMonths.test.ts → tests/getUniqueMonths.test.ts b/utils/getUniqueMonths.test.ts → tests/getUniqueMonths.test.ts
diff --git a/utils/groupByYear.test.ts → tests/groupByYear.test.ts b/utils/groupByYear.test.ts → tests/groupByYear.test.ts
diff --git a/utils/sortByMake.test.ts → tests/sortByMake.test.ts b/utils/sortByMake.test.ts → tests/sortByMake.test.ts
diff --git a/utils/sortDates.test.ts → tests/sortDates.test.ts b/utils/sortDates.test.ts → tests/sortDates.test.ts
@@ -1,4 +1,4 @@
-import { sortAscendingDates, sortDescendingDates } from "./sortDates";
+import { sortAscendingDates, sortDescendingDates } from "../utils/sortDates";
 
 describe("sortDates", () => {
   const testDates = [