Merge pull request nestjs#1852 from WonderPanda/samples_fixes

sample(): fix unit tests in sample-01
palmfuture · Mar 27, 2019 · 61df77d · 61df77d
2 parents 029082b + 2eb2a03
commit 61df77d
Show file tree

Hide file tree

Showing 5 changed files with 5,456 additions and 5 deletions.
diff --git a/integration/docker-compose.yml b/integration/docker-compose.yml
@@ -24,7 +24,6 @@ services:
     restart: always
   mysql:
     image: mysql:5.7.25
-    restart: always
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: test
@@ -43,4 +42,4 @@ services:
     ports:
       - "15672:15672"
       - "5672:5672"
-    tty: true
+    tty: true
diff --git a/sample/01-cats-app/e2e/jest-e2e.json b/sample/01-cats-app/e2e/jest-e2e.json
@@ -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/**"],

diff --git a/sample/01-cats-app/jest.json b/sample/01-cats-app/jest.json
@@ -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/**"],