Skip to content

Commit

Permalink
Merge pull request #126 from COS301-SE-2024/feature/web/dashboard
Browse files Browse the repository at this point in the history
Feature/web/dashboard
  • Loading branch information
Tinashe-Austin authored Jul 2, 2024
2 parents 7f58fbc + 06fccd7 commit e7c7d4c
Show file tree
Hide file tree
Showing 75 changed files with 729 additions and 18,870 deletions.
10 changes: 10 additions & 0 deletions frontend/occupi-web/bun-test-extend.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// // bun-test-extend.d.ts
// import '@testing-library/jest-dom/extend-expect';
// import { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';

// declare module 'bun:test' {
// export default interface Expect<T = unknown>
// extends TestingLibraryMatchers<ReturnType<typeof expect.stringContaining>, T> {
// [x: string]: any;
// }
// }
Binary file modified frontend/occupi-web/bun.lockb
Binary file not shown.
3 changes: 3 additions & 0 deletions frontend/occupi-web/jest-setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// jest-setup.ts
import '@testing-library/jest-dom';
// You can remove the import for extend-expect and matchers if not used elsewhere
25 changes: 0 additions & 25 deletions frontend/occupi-web/jest.config.js

This file was deleted.

26 changes: 26 additions & 0 deletions frontend/occupi-web/jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// jest.config.js

module.exports = {
preset: "ts-jest",
testEnvironment: "jsdom",
setupFilesAfterEnv: ['<rootDir>/setupTests.ts'],//this crtlz
moduleNameMapper: {
"\\.(css|less|scss|sass)$": "identity-obj-proxy",
"^@api/(.*)$": "<rootDir>/src/api/$1",
"^@assets/(.*)$": "<rootDir>/src/assets/$1",
"^@components/(.*)$": "<rootDir>/src/components/$1",
"^@config/(.*)$": "<rootDir>/src/config/$1",
"^@layouts/(.*)$": "<rootDir>/src/layouts/$1",
"^@lib/(.*)$": "<rootDir>/src/lib/$1",
"^@pages/(.*)$": "<rootDir>/src/pages/$1",
"^@services/(.*)$": "<rootDir>/src/services/$1",
"^@store/(.*)$": "<rootDir>/src/store/$1",
"^@utils/(.*)$": "<rootDir>/src/utils/$1",
},
transform: {
'^.+\\.tsx?$': 'ts-jest',
'\\.(jpg|jpeg|png|gif|webp|svg)$': 'jest-transform-stub',
},
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
testPathIgnorePatterns: ["/node_modules/", "/dist/"],
};
2 changes: 0 additions & 2 deletions frontend/occupi-web/jest.setup.ts

This file was deleted.

Loading

0 comments on commit e7c7d4c

Please sign in to comment.