Skip to content

Commit

Permalink
Merge pull request #7 from oxsecurity/OXDEV-15796-fix-unit-tests-not-…
Browse files Browse the repository at this point in the history
…running-because-of-cypress-jest-types-collision

Fix jest and cypress types collision
  • Loading branch information
itayox authored Jul 23, 2023
2 parents 8b8243f + de7553d commit f55c8cd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions jest.config.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import dotenv from "dotenv";

// load ENV variables from .env file
dotenv.config({ path: "./.env" });

// For VSCode support using the "Jest" extension by "Orta"
// (same goes for the root tsconfig.json file)
export default {
Expand Down
3 changes: 2 additions & 1 deletion packages/backend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
"esModuleInterop": true,
"strict": false
},
"include": ["src/**/*.ts"]
"include": ["src/**/*.ts"],
"exclude": ["cypress"]
}
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"esModuleInterop": true
}
},
"exclude": ["cypress", "cypress.config.ts"]
}

0 comments on commit f55c8cd

Please sign in to comment.