From 6fc1dfbdcf374cacbba73dcaa68e9553cbfb3217 Mon Sep 17 00:00:00 2001
From: Ru Chern Chong <ruchern.chong@sgcarstrends.com>
Date: Sun, 10 Nov 2024 02:58:21 +0800
Subject: [PATCH] Refactor and separate tests from Jest and Playwright

---
 jest.config.js                                 | 5 +++++
 {utils => tests}/capitaliseWords.test.ts       | 0
 {utils => tests}/fetchApi.test.ts              | 0
 {utils => tests}/formatDateToMonthYear.test.ts | 2 +-
 {utils => tests}/formatOrdinal.test.ts         | 2 +-
 {utils => tests}/formatPercent.test.ts         | 0
 {utils => tests}/getUniqueMonths.test.ts       | 0
 {utils => tests}/groupByYear.test.ts           | 0
 {utils => tests}/sortByMake.test.ts            | 0
 {utils => tests}/sortDates.test.ts             | 2 +-
 10 files changed, 8 insertions(+), 3 deletions(-)
 rename {utils => tests}/capitaliseWords.test.ts (100%)
 rename {utils => tests}/fetchApi.test.ts (100%)
 rename {utils => tests}/formatDateToMonthYear.test.ts (80%)
 rename {utils => tests}/formatOrdinal.test.ts (92%)
 rename {utils => tests}/formatPercent.test.ts (100%)
 rename {utils => tests}/getUniqueMonths.test.ts (100%)
 rename {utils => tests}/groupByYear.test.ts (100%)
 rename {utils => tests}/sortByMake.test.ts (100%)
 rename {utils => tests}/sortDates.test.ts (96%)

diff --git a/jest.config.js b/jest.config.js
index 00f75d5..e7c1418 100644
--- 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 b/tests/capitaliseWords.test.ts
similarity index 100%
rename from utils/capitaliseWords.test.ts
rename to tests/capitaliseWords.test.ts
diff --git a/utils/fetchApi.test.ts b/tests/fetchApi.test.ts
similarity index 100%
rename from utils/fetchApi.test.ts
rename to tests/fetchApi.test.ts
diff --git a/utils/formatDateToMonthYear.test.ts b/tests/formatDateToMonthYear.test.ts
similarity index 80%
rename from utils/formatDateToMonthYear.test.ts
rename to tests/formatDateToMonthYear.test.ts
index e9a8493..5214560 100644
--- a/utils/formatDateToMonthYear.test.ts
+++ b/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 b/tests/formatOrdinal.test.ts
similarity index 92%
rename from utils/formatOrdinal.test.ts
rename to tests/formatOrdinal.test.ts
index df4d121..7e4d4b3 100644
--- a/utils/formatOrdinal.test.ts
+++ b/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 b/tests/formatPercent.test.ts
similarity index 100%
rename from utils/formatPercent.test.ts
rename to tests/formatPercent.test.ts
diff --git a/utils/getUniqueMonths.test.ts b/tests/getUniqueMonths.test.ts
similarity index 100%
rename from utils/getUniqueMonths.test.ts
rename to tests/getUniqueMonths.test.ts
diff --git a/utils/groupByYear.test.ts b/tests/groupByYear.test.ts
similarity index 100%
rename from utils/groupByYear.test.ts
rename to tests/groupByYear.test.ts
diff --git a/utils/sortByMake.test.ts b/tests/sortByMake.test.ts
similarity index 100%
rename from utils/sortByMake.test.ts
rename to tests/sortByMake.test.ts
diff --git a/utils/sortDates.test.ts b/tests/sortDates.test.ts
similarity index 96%
rename from utils/sortDates.test.ts
rename to tests/sortDates.test.ts
index ac09491..cd5af9c 100644
--- a/utils/sortDates.test.ts
+++ b/tests/sortDates.test.ts
@@ -1,4 +1,4 @@
-import { sortAscendingDates, sortDescendingDates } from "./sortDates";
+import { sortAscendingDates, sortDescendingDates } from "../utils/sortDates";
 
 describe("sortDates", () => {
   const testDates = [