fix: update inBand runs failing, reorganize jest configs

Signed-off-by: Charlike Mike Reagent <opensource@tunnckocore.com>
tunnckoCore · Oct 2, 2019 · 684a758 · 684a758
1 parent 52213cb
commit 684a758
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 29 deletions.
diff --git a/@tunnckocore/create-jest-runner/src/createJestRunner.js b/@tunnckocore/create-jest-runner/src/createJestRunner.js
@@ -78,7 +78,18 @@ const createRunner = (runPath, { getExtraOptions } = {}) => {
                   return runner(baseOptions);
                 });
               })
-              .then((result) => onResult(test, result))
+              .then((testResult) => {
+                if (Array.isArray(testResult)) {
+                  testResult.forEach((result) =>
+                    result.numFailingTests > 0
+                      ? onFailure(test, new Error(result.errorMessage))
+                      : onResult(test, result),
+                  );
+                  return;
+                }
+
+                onResult(test, testResult);
+              })
               .catch((err) => onFailure(test, err)),
           ),
         Promise.resolve(),

diff --git a/jest-runner.config.js b/jest-runner.config.js
@@ -22,7 +22,7 @@ module.exports = {
       config: {
         presets: [['@tunnckocore/babel-preset', presetOptions]],
         comments: false,
-        sourceMaps: 'both',
+        sourceMaps: true,
       },
       outDir: 'dist/main',
     },
@@ -32,7 +32,7 @@ module.exports = {
           ['@tunnckocore/babel-preset', { ...presetOptions, modules: false }],
         ],
         comments: false,
-        sourceMaps: 'both',
+        sourceMaps: true,
       },
       outDir: 'dist/module',
     },

diff --git a/jest.config.js b/jest.config.js
diff --git a/jest.build.config.js → jest/build.js b/jest.build.config.js → jest/build.js
@@ -1,10 +1,12 @@
-const utils = require('./@tunnckocore/utils/src');
+const path = require('path');
+const utils = require('../@tunnckocore/utils/src');
 
-const { exts } = utils.getWorkspacesAndExtensions(__dirname);
+const ROOT = path.dirname(__dirname);
+const { exts } = utils.getWorkspacesAndExtensions(ROOT);
 
 module.exports = {
+  rootDir: ROOT,
   displayName: 'build',
-  rootDir: __dirname,
   testMatch: [
     '<rootDir>/packages/*/src/**/*',
     '<rootDir>/@tunnckocore/*/src/**/*',

diff --git a/jest.bundle.config.js → jest/bundle.js b/jest.bundle.config.js → jest/bundle.js
@@ -1,14 +1,16 @@
-const utils = require('./@tunnckocore/utils/src');
+const path = require('path');
+const utils = require('../@tunnckocore/utils/src');
 
-const { exts } = utils.getWorkspacesAndExtensions(__dirname);
+const ROOT = path.dirname(__dirname);
+const { exts } = utils.getWorkspacesAndExtensions(ROOT);
 
 module.exports = {
+  rootDir: ROOT,
   displayName: 'bundle',
-  rootDir: __dirname,
   testMatch: [
     // '<rootDir>/src/index.ts',
     // '<rootDir>/packages/*/src/**/*',
-    `<rootDir>/@tunnckocore/*/src/index.js`,
+    `<rootDir>/@tunnckocore/execa/src/index.js`,
     // `<rootDir>/src/zzz*`,
   ],
   testPathIgnorePatterns: [
@@ -18,5 +20,5 @@ module.exports = {
   ],
   // moduleNameMapper: alias,
   moduleFileExtensions: exts,
-  runner: './packages/jest-runner-rollup/src/index.js',
+  runner: path.join(ROOT, 'packages/jest-runner-rollup/src/index.js'),
 };
diff --git a/jest/full.js b/jest/full.js
@@ -0,0 +1,4 @@
+/* eslint-disable global-require */
+module.exports = {
+  projects: [require('./lint'), require('./test'), require('./build')],
+};
diff --git a/jest.lint.config.js → jest/lint.js b/jest.lint.config.js → jest/lint.js
@@ -1,10 +1,12 @@
-const utils = require('./@tunnckocore/utils/src');
+const path = require('path');
+const utils = require('../@tunnckocore/utils/src');
 
-const { alias, exts } = utils.createAliases(__dirname, 'src');
+const ROOT = path.dirname(__dirname);
+const { alias, exts } = utils.createAliases(ROOT, 'src');
 
 module.exports = {
+  rootDir: ROOT,
   displayName: 'lint',
-  rootDir: __dirname,
   testMatch: [
     '<rootDir>/packages/*/src/**/*',
     '<rootDir>/@tunnckocore/*/src/**/*',

diff --git a/jest.test.config.js → jest/test.js b/jest.test.config.js → jest/test.js
@@ -1,10 +1,12 @@
-const utils = require('./@tunnckocore/utils/src');
+const path = require('path');
+const utils = require('../@tunnckocore/utils/src');
 
-const { alias } = utils.createAliases(__dirname, 'src');
+const ROOT = path.dirname(__dirname);
+const { alias } = utils.createAliases(ROOT, 'src');
 
 module.exports = {
+  rootDir: ROOT,
   displayName: 'test',
-  rootDir: __dirname,
   testMatch: [
     '<rootDir>/packages/*/test/**/*',
     '<rootDir>/@tunnckocore/*/test/**/*',

diff --git a/package.json b/package.json
@@ -16,11 +16,11 @@
     "clean:fresh": "lerna clean -y && rm -rf node_modules",
     "clean:dist": "rm -rf packages/*/dist @tunnckocore/*/dist",
     "pre-commit": "yarn jest:all || (yarn resque && yarn jest:all)",
-    "jest:all": "jest -c jest.config.js",
-    "lint": "jest -c jest.lint.config.js",
-    "test": "jest -c jest.test.config.js",
-    "build": "jest -c jest.build.config.js",
-    "bundle": "jest -c jest.bundle.config.js",
+    "jest:all": "jest -c jest/full.js",
+    "lint": "jest -c jest/lint.js",
+    "test": "jest -c jest/test.js",
+    "build": "jest -c jest/build.js",
+    "bundle": "jest -c jest/bundle.js",
     "release": "lerna version && lerna publish from-package",
     "cr": "node create-package.js",
     "fmt": "prettier '**/*' --write --check",