feat: support Jest v26 (#1602)

Co-authored-by: Marek Urbanowicz <marek@urbanowicz.dev>
kulshekhar · May 6, 2020 · 23b7741 · 23b7741
1 parent ffe96c4
commit 23b7741
Show file tree

Hide file tree

Showing 45 changed files with 9,195 additions and 3,743 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 jobs:
   include:
     - os: windows
-      node_js: 8
+      node_js: 10
       env: TS_JEST_E2E_WORKDIR=\%APPDATA%\ts-jest-e2e-workdir TS_JEST_E2E_OPTIMIZATIONS=1
       cache:
         npm: true
@@ -14,7 +14,7 @@ jobs:
         - npm run clean -- --when-ci-commit-message
         - npm run test:unit -- --runInBand
     - os: windows
-      node_js: 12
+      node_js: 14
       env: TS_JEST_E2E_WORKDIR=\%APPDATA%\ts-jest-e2e-workdir TS_JEST_E2E_OPTIMIZATIONS=1
       cache:
         npm: true
@@ -27,7 +27,7 @@ jobs:
         - npm run clean -- --when-ci-commit-message
         - npm run test:external-repos
     - os: linux
-      node_js: 10
+      node_js: 12
       env: TS_JEST_E2E_WORKDIR=/tmp/ts-jest-e2e-workdir TS_JEST_E2E_OPTIMIZATIONS=1
       before_install:
         # Disabled, randomly works :-/

diff --git a/e2e/__external-repos__/custom-typings/package.json b/e2e/__external-repos__/custom-typings/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@types/jest": "^25.2.1",
     "@types/jquery": "^3.3.35",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
 }
diff --git a/e2e/__external-repos__/simple-project-references/package.json b/e2e/__external-repos__/simple-project-references/package.json
@@ -7,7 +7,7 @@
   "devDependencies": {
     "@types/jest": "^25.2.1",
     "@types/lodash": "^4.14.116",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
 }
diff --git a/e2e/__external-repos__/simple/with-dependency/package.json b/e2e/__external-repos__/simple/with-dependency/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@types/jest": "^25.2.1",
     "dependency": "file:../dependency",
-    "jest": "^25.4.0"
+    "jest": "^26.0.1"
   },
   "main": "./index.ts"
 }
diff --git a/e2e/__external-repos__/yarn-workspace-composite/package.json b/e2e/__external-repos__/yarn-workspace-composite/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@types/jest": "^25.2.1",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "typescript": "~3.8.3"
   }
 }
diff --git a/e2e/__external-repos__/yarn-workspace-composite/packages/my-library/package.json b/e2e/__external-repos__/yarn-workspace-composite/packages/my-library/package.json
@@ -2,4 +2,4 @@
   "name": "@workspace-composite/my-library",
   "version": "1.0.0",
   "private": true
-}
+}
diff --git a/e2e/__helpers__/test-case/utils.ts b/e2e/__helpers__/test-case/utils.ts
@@ -28,13 +28,13 @@ export function normalizeJestOutput(output: string): string {
   let out: string = output
     .trim()
     // removes total and estimated times
-    .replace(/^(\s*Time\s*:\s*)[\d.]+m?s(?:(,\s*estimated\s+)[\d.]+m?s)?$/gm, (_, start) => `${start}XXs`)
+    .replace(/^(\s*Time\s*:\s*)[\d.]+ m?s(?:(,\s*estimated\s+)[\d.]+ m?s)?$/gm, (_, start) => `${start}XXs`)
     // remove times after PASS/FAIL path/to/file (xxxs)
     .replace(/^\s*((?:PASS|FAIL) .+) \([\d.]+m?s\)$/gm, (_, start) => `${start}`)
     // removes each test time values
     .replace(
       // eslint-disable-next-line no-useless-escape
-      /^(\s*)(✕|×|✓|√)(\s+[^\(]+)(\s+\([\d.]+m?s\))?$/gm,
+      /^(\s*)(✕|×|✓|√)(\s+[^\(]+)(\s+\([\d.]+ m?s\))?$/gm,
       (_, start, mark, mid /* , time */) => `${start}${normalizeTestMark(mark)}${mid}`,
     )
   // TODO: improves this...