Change location of test files to fix build issue

hwinther · Jun 30, 2024 · 8cbb704 · 8cbb704
1 parent bb468c5
commit 8cbb704
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.../src/pages/index/__tests__/+Page.test.tsx → src/frontend/test/pages/index.test.tsx b/.../src/pages/index/__tests__/+Page.test.tsx → src/frontend/test/pages/index.test.tsx
@@ -1,8 +1,7 @@
+import { render, screen } from '~test/testUtils'
 import { expect, it } from 'vitest'
 
-import { render, screen } from '~/test/testUtils'
-
-import Page from '../+Page'
+import Page from '~/pages/index/+Page'
 
 it('renders welcome message', () => {
   render(<Page />, { mockAuthContext: true, withQueryProvider: true })

diff --git a/src/frontend/src/test/setupTests.ts → src/frontend/test/setupTests.ts b/src/frontend/src/test/setupTests.ts → src/frontend/test/setupTests.ts
diff --git a/src/frontend/src/test/testUtils.tsx → src/frontend/test/testUtils.tsx b/src/frontend/src/test/testUtils.tsx → src/frontend/test/testUtils.tsx
diff --git a/src/frontend/tsconfig.json b/src/frontend/tsconfig.json
@@ -7,10 +7,12 @@
     "skipLibCheck": true,
 
     /* Paths */
-    "baseUrl": "src",
+    "baseUrl": ".",
     "paths": {
-      "~/*": ["*"],
-      "~components/*": ["components/*"]
+      "~/*": ["src/*"],
+      //"~components/*": ["src/components/*"],
+      //"~pages/*": ["src/pages/*"],
+      "~test/*": ["test/*"]
     },
 
     /* Bundler mode */
@@ -30,6 +32,6 @@
     "strictNullChecks": true,
     "allowJs": true
   },
-  "include": ["src", "eslint.config.mjs", "orval.config.cjs"],
+  "include": ["src", "test", "eslint.config.mjs", "orval.config.cjs"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.ts
@@ -12,7 +12,9 @@ export default defineConfig({
   resolve: {
     alias: {
       '~': '/src',
-      '~components': '/src/components',
+      //'~components': '/src/components',
+      //'~pages': '/src/pages',
+      '~test': '/test',
     },
   },
   build: {
@@ -22,7 +24,7 @@ export default defineConfig({
   test: {
     globals: true,
     environment: 'jsdom',
-    setupFiles: './src/test/setupTests.ts',
+    setupFiles: './test/setupTests.ts',
     mockReset: true,
     coverage: { enabled: true, provider: 'istanbul', reporter: ['cobertura', 'lcov', 'html'] },
     reporters: ['verbose', 'github-actions', 'junit'],