From c3214055c2f1f70e960b718e9dd8a061641678d2 Mon Sep 17 00:00:00 2001
From: Chris Chudzicki <christopher.chudzicki@gmail.com>
Date: Wed, 2 Oct 2024 13:24:31 -0400
Subject: [PATCH 1/2] re-enable nextjs tests

---
 frontends/main/jest.config.ts                     | 15 +++++++++++++++
 .../[id]/view/ProgramLetter.test.tsx              |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 frontends/main/jest.config.ts

diff --git a/frontends/main/jest.config.ts b/frontends/main/jest.config.ts
new file mode 100644
index 0000000000..73e8e0a438
--- /dev/null
+++ b/frontends/main/jest.config.ts
@@ -0,0 +1,15 @@
+import path from "path"
+import type { Config } from "@jest/types"
+import baseConfig from "../jest.jsdom.config"
+const config: Config.InitialOptions = {
+  ...baseConfig,
+  setupFilesAfterEnv: [
+    ...baseConfig.setupFilesAfterEnv,
+    "./test-utils/setupJest.ts",
+  ],
+  moduleNameMapper: {
+    "^@/(.*)$": path.resolve(__dirname, "src/$1"),
+    ...baseConfig.moduleNameMapper,
+  },
+}
+export default config
diff --git a/frontends/main/src/app-pages/ProgramLetterPage/[id]/view/ProgramLetter.test.tsx b/frontends/main/src/app-pages/ProgramLetterPage/[id]/view/ProgramLetter.test.tsx
index 33bf36c46c..46d1fe7ec0 100644
--- a/frontends/main/src/app-pages/ProgramLetterPage/[id]/view/ProgramLetter.test.tsx
+++ b/frontends/main/src/app-pages/ProgramLetterPage/[id]/view/ProgramLetter.test.tsx
@@ -18,7 +18,8 @@ const setup = ({ programLetter }: { programLetter: ProgramLetter }) => {
 }
 
 describe("ProgramLetterDisplayPage", () => {
-  it("Renders a program letter from api", async () => {
+  // See https://github.com/mitodl/hq/issues/5694
+  it.skip("Renders a program letter from api", async () => {
     const programLetter = factory.programLetter()
     setup({ programLetter })
     await waitFor(() => {

From b0d3a4e28e663ea6642f06934ceea2c61846e64e Mon Sep 17 00:00:00 2001
From: Chris Chudzicki <christopher.chudzicki@gmail.com>
Date: Wed, 2 Oct 2024 13:40:22 -0400
Subject: [PATCH 2/2] re-enable tests on main workspace

---
 frontends/jest.jsdom.config.ts                                  | 2 +-
 frontends/main/jest.config.ts                                   | 2 +-
 .../src/filemocks/{svgmock.js => imagemock.js}                  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename frontends/ol-test-utilities/src/filemocks/{svgmock.js => imagemock.js} (100%)

diff --git a/frontends/jest.jsdom.config.ts b/frontends/jest.jsdom.config.ts
index 6c7ce2b08f..4c697e796c 100644
--- a/frontends/jest.jsdom.config.ts
+++ b/frontends/jest.jsdom.config.ts
@@ -12,7 +12,7 @@ const config: Config.InitialOptions &
     "^.+\\.(t|j)sx?$": "@swc/jest",
   },
   moduleNameMapper: {
-    "\\.svg$": "ol-test-utilities/filemocks/svgmock.js",
+    "\\.(svg|jpg|jpeg|png)$": "ol-test-utilities/filemocks/imagemock.js",
     "\\.(css|scss)$": "ol-test-utilities/filemocks/filemock.js",
   },
   rootDir: "./src",
diff --git a/frontends/main/jest.config.ts b/frontends/main/jest.config.ts
index 73e8e0a438..aeac67f356 100644
--- a/frontends/main/jest.config.ts
+++ b/frontends/main/jest.config.ts
@@ -8,8 +8,8 @@ const config: Config.InitialOptions = {
     "./test-utils/setupJest.ts",
   ],
   moduleNameMapper: {
-    "^@/(.*)$": path.resolve(__dirname, "src/$1"),
     ...baseConfig.moduleNameMapper,
+    "^@/(.*)$": path.resolve(__dirname, "src/$1"),
   },
 }
 export default config
diff --git a/frontends/ol-test-utilities/src/filemocks/svgmock.js b/frontends/ol-test-utilities/src/filemocks/imagemock.js
similarity index 100%
rename from frontends/ol-test-utilities/src/filemocks/svgmock.js
rename to frontends/ol-test-utilities/src/filemocks/imagemock.js