Skip to content

Commit

Permalink
ci: 충돌 해결 및 테스트용 테스트 파일 업로드
Browse files Browse the repository at this point in the history
  • Loading branch information
ImxYJL committed Jul 23, 2024
2 parents 835e826 + d037490 commit fb7c128
Show file tree
Hide file tree
Showing 4 changed files with 488 additions and 18 deletions.
7 changes: 7 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"@emotion/styled": "^11.11.5",
"@tanstack/react-query": "^5.51.1",
"@tanstack/react-query-devtools": "^5.51.1",
"@testing-library/jest-dom": "^6.4.7",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"dotenv-webpack": "^8.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand All @@ -29,6 +32,8 @@
"@babel/preset-typescript": "^7.24.7",
"@emotion/babel-plugin": "^11.11.0",
"@stylelint/postcss-css-in-js": "^0.38.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.0.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.16.0",
Expand All @@ -43,6 +48,8 @@
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.8",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"msw": "^2.3.1",
"postcss-syntax": "^0.36.2",
"prettier": "^3.3.2",
Expand Down
4 changes: 4 additions & 0 deletions frontend/tempTest.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
test('테스트하자!', () => {
const onePlusOne = 1 + 1;
expect(onePlusOne).toBe(2);
});
3 changes: 2 additions & 1 deletion frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"paths": {
"@/*": ["src/*"]
},
"jsxImportSource": "@emotion/react"
"jsxImportSource": "@emotion/react",
"types": ["jest", "@testing-library/jest-dom"]
},
"include": ["src", "**/*.tsx", "types.d.ts"],
"exclude": ["node_modules", "dist"]
Expand Down
Loading

0 comments on commit fb7c128

Please sign in to comment.