chore+fix: upgrade jest + fix flaky renderStream test! (coralproject#…

…2350)
MozillaFoundation · Jun 7, 2019 · 8126491 · 8126491
1 parent 5b64d3d
commit 8126491
Show file tree

Hide file tree

Showing 7 changed files with 2,257 additions and 3,192 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -9,6 +9,7 @@ const lodashOptimizations =
   process.env.WEBPACK === "true" ? ["use-lodash-es", "lodash"] : [];
 
 module.exports = {
+  babelrcRoots: ["./src/core/client/*"],
   env: {
     production: {
       plugins: [...lodashOptimizations],
@@ -18,7 +19,7 @@ module.exports = {
     },
     test: {
       presets: [
-        ["@babel/env", { targets: "last 2 versions", modules: "commonjs" }],
+        ["@babel/env", { targets: { node: "current" } }],
         "@babel/react",
       ],
       plugins: ["dynamic-import-node"],

diff --git a/config/jest/client.config.js b/config/jest/client.config.js
@@ -10,8 +10,7 @@ module.exports = {
     "<rootDir>/src/core/build/polyfills.js",
     "<rootDir>/src/core/client/test/setup.ts",
   ],
-  setupTestFrameworkScriptFile:
-    "<rootDir>/src/core/client/test/setupTestFramework.ts",
+  setupFilesAfterEnv: ["<rootDir>/src/core/client/test/setupTestFramework.ts"],
   testMatch: ["**/*.spec.{js,jsx,mjs,ts,tsx}"],
   testEnvironment: "node",
   testURL: "http://localhost",
@@ -40,7 +39,10 @@ module.exports = {
   globals: {
     "ts-jest": {
       useBabelrc: true,
-      tsConfigFile: path.resolve(__dirname, "tsconfig.jest.json"),
+      tsConfigFile: path.resolve(
+        __dirname,
+        "../../src/core/client/tsconfig.json"
+      ),
     },
   },
 };
diff --git a/config/jest/server.config.js b/config/jest/server.config.js
@@ -1,3 +1,5 @@
+const path = require("path");
+
 module.exports = {
   displayName: "server",
   rootDir: "../../",
@@ -19,6 +21,7 @@ module.exports = {
   globals: {
     "ts-jest": {
       useBabelrc: true,
+      tsConfigFile: path.resolve(__dirname, "../../src/tsconfig.json"),
     },
   },
 };
diff --git a/config/jest/tsconfig.jest.json b/config/jest/tsconfig.jest.json