Skip to content

Commit

Permalink
test(sample/01) fix broken tests
Browse files Browse the repository at this point in the history
- update jest configuration to remove warnings
- fix tests so that they run out of the box with correct types
- remove duplicate key from docker-compose
  • Loading branch information
WonderPanda committed Mar 26, 2019
1 parent 15bbd74 commit 2eb2a03
Show file tree
Hide file tree
Showing 5 changed files with 5,456 additions and 5 deletions.
3 changes: 1 addition & 2 deletions integration/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ services:
restart: always
mysql:
image: mysql:5.7.25
restart: always
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: test
Expand All @@ -43,4 +42,4 @@ services:
ports:
- "15672:15672"
- "5672:5672"
tty: true
tty: true
2 changes: 1 addition & 1 deletion sample/01-cats-app/e2e/jest-e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"json"
],
"transform": {
"^.+\\.tsx?$": "<rootDir>/../node_modules/ts-jest/preprocessor.js"
"^.+\\.tsx?$": "ts-jest"
},
"testRegex": "/e2e/.*\\.(e2e-test|e2e-spec).(ts|tsx|js)$",
"collectCoverageFrom" : ["src/**/*.{js,jsx,tsx,ts}", "!**/node_modules/**", "!**/vendor/**"],
Expand Down
2 changes: 1 addition & 1 deletion sample/01-cats-app/jest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"json"
],
"transform": {
"^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
"^.+\\.tsx?$": "ts-jest"
},
"testRegex": "/src/.*\\.(test|spec).(ts|tsx|js)$",
"collectCoverageFrom" : ["src/**/*.{js,jsx,tsx,ts}", "!**/node_modules/**", "!**/vendor/**"],
Expand Down
Loading

0 comments on commit 2eb2a03

Please sign in to comment.