From 079141b41426353181d9363955f7777cce7250ce Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:19:27 +0300 Subject: [PATCH 01/10] make tests pass by disabling colors Signed-off-by: Charlike Mike Reagent --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c5596a..78769fd 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "generator/" ], "scripts": { - "test": "jest", + "test": "jest --no-colors", "lint": "eslint .", "watch": "babel lib -w --ignore **/*.test.js,integration -d build", "build": "babel lib --ignore **/*.test.js,integration -d build", From bdaf9447a71dfbc807279615d2d78ff7dfa18b4c Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:20:45 +0300 Subject: [PATCH 02/10] changes for #20 Signed-off-by: Charlike Mike Reagent --- lib/createJestRunner.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/createJestRunner.js b/lib/createJestRunner.js index da01b32..b8b26c5 100644 --- a/lib/createJestRunner.js +++ b/lib/createJestRunner.js @@ -142,8 +142,18 @@ const createRunner = (runPath, { getExtraOptions } = {}) => { const runAllTests = Promise.all( tests.map(test => runTestInWorker(test) - .then(testResult => onResult(test, testResult)) - .catch(error => onError(error, test)), + .then(testResult => { + if (Array.isArray(testResult)) { + testResult.forEach(result => + result.errorMessage && result.stats.failures > 0 + ? onError(new Error(result.errorMessage), test) + : onResult(test, result), + ); + return; + } + onResult(test, testResult); + }) + .catch(err => onError(err, test)), ), ); From add4b0a70c7d453d4bfd6f90de7918a2d5b32be3 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:25:34 +0300 Subject: [PATCH 03/10] fix linting, ignore fixtures dirs Signed-off-by: Charlike Mike Reagent --- .eslintignore | 4 +++- package.json | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.eslintignore b/.eslintignore index 390c521..23ddbc1 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,4 @@ **/node_modules -build \ No newline at end of file +build +integrationTests/__fixtures__ +generator/fixtures diff --git a/package.json b/package.json index 78769fd..24a4568 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "create-jest-runner", - "version": "0.5.3", + "name": "@tunnckocore/create-jest-runner", + "version": "0.5.4", "main": "build/index.js", "author": "Rogelio Guzman ", "description": "A simple way of creating a Jest runner", @@ -12,6 +12,7 @@ "generator/" ], "scripts": { + "pre-commit": "yarn lint && yarn test && yarn build", "test": "jest --no-colors", "lint": "eslint .", "watch": "babel lib -w --ignore **/*.test.js,integration -d build", From 31576cdfb94ac74bfc2df510556d80b4fb2f446b Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:26:18 +0300 Subject: [PATCH 04/10] update prepublish script Signed-off-by: Charlike Mike Reagent --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 24a4568..f2beefe 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,11 @@ "generator/" ], "scripts": { - "pre-commit": "yarn lint && yarn test && yarn build", "test": "jest --no-colors", "lint": "eslint .", "watch": "babel lib -w --ignore **/*.test.js,integration -d build", "build": "babel lib --ignore **/*.test.js,integration -d build", - "prepublish": "yarn build", + "prepublish": "yarn lint && yarn test && yarn build", "format": "prettier --single-quote --trailing-comma all --write \"!(build)/**/*.js\"" }, "dependencies": { From 0b5479af1887bf13fdec3aa18ac2bf1090443229 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:27:05 +0300 Subject: [PATCH 05/10] oops, fix the version, as it was from the beginning Signed-off-by: Charlike Mike Reagent --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2beefe..abb3614 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tunnckocore/create-jest-runner", - "version": "0.5.4", + "version": "0.5.3", "main": "build/index.js", "author": "Rogelio Guzman ", "description": "A simple way of creating a Jest runner", From 24cd1795f3ff2c317f2b347199ebe57b68e316e7 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:28:49 +0300 Subject: [PATCH 06/10] oops, fix the name Signed-off-by: Charlike Mike Reagent --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index abb3614..9354856 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@tunnckocore/create-jest-runner", + "name": "create-jest-runner", "version": "0.5.3", "main": "build/index.js", "author": "Rogelio Guzman ", From c78dea9dab01918217ea47d0523c6b4daf02dbb3 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 00:47:59 +0300 Subject: [PATCH 07/10] use prepublishOnly script Signed-off-by: Charlike Mike Reagent --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9354856..42923f3 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "lint": "eslint .", "watch": "babel lib -w --ignore **/*.test.js,integration -d build", "build": "babel lib --ignore **/*.test.js,integration -d build", - "prepublish": "yarn lint && yarn test && yarn build", + "prepublishOnly": "yarn lint && yarn test && yarn build", "format": "prettier --single-quote --trailing-comma all --write \"!(build)/**/*.js\"" }, "dependencies": { From 6475b094c6006b7108155266a73c41eebe0c8403 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 18 Sep 2019 01:17:34 +0300 Subject: [PATCH 08/10] update scripts Signed-off-by: Charlike Mike Reagent --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 42923f3..11bd3ed 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,13 @@ "generator/" ], "scripts": { + "pre-commit": "yarn test && yarn lint", + "pretest": "yarn build", "test": "jest --no-colors", - "lint": "eslint .", + "lint": "eslint . --fix", "watch": "babel lib -w --ignore **/*.test.js,integration -d build", "build": "babel lib --ignore **/*.test.js,integration -d build", - "prepublishOnly": "yarn lint && yarn test && yarn build", + "prepublishOnly": "yarn pre-commit", "format": "prettier --single-quote --trailing-comma all --write \"!(build)/**/*.js\"" }, "dependencies": { From 813f9d1abf72fc390e7674cad69e6af0bfc141bd Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 2 Oct 2019 17:03:57 +0300 Subject: [PATCH 09/10] fix: apply the changes to inBand runs too Signed-off-by: Charlike Mike Reagent --- lib/createJestRunner.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/createJestRunner.js b/lib/createJestRunner.js index b8b26c5..a3154b0 100644 --- a/lib/createJestRunner.js +++ b/lib/createJestRunner.js @@ -73,7 +73,17 @@ const createRunner = (runPath, { getExtraOptions } = {}) => { return runner(baseOptions); }); }) - .then(result => onResult(test, result)) + .then(testResult => { + if (Array.isArray(testResult)) { + testResult.forEach(result => + result.errorMessage && result.stats.failures > 0 + ? onFailure(test, new Error(result.errorMessage)) + : onResult(test, result), + ); + return; + } + onResult(test, testResult); + }) .catch(err => onFailure(test, err)), ), Promise.resolve(), From 946dde5ea3f68b58ada19ddea801e663bc4a45c0 Mon Sep 17 00:00:00 2001 From: Charlike Mike Reagent Date: Wed, 2 Oct 2019 18:24:40 +0300 Subject: [PATCH 10/10] fix: rely on numFailingTests Signed-off-by: Charlike Mike Reagent --- lib/createJestRunner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/createJestRunner.js b/lib/createJestRunner.js index a3154b0..8a42704 100644 --- a/lib/createJestRunner.js +++ b/lib/createJestRunner.js @@ -76,7 +76,7 @@ const createRunner = (runPath, { getExtraOptions } = {}) => { .then(testResult => { if (Array.isArray(testResult)) { testResult.forEach(result => - result.errorMessage && result.stats.failures > 0 + result.numFailingTests > 0 ? onFailure(test, new Error(result.errorMessage)) : onResult(test, result), ); @@ -155,7 +155,7 @@ const createRunner = (runPath, { getExtraOptions } = {}) => { .then(testResult => { if (Array.isArray(testResult)) { testResult.forEach(result => - result.errorMessage && result.stats.failures > 0 + result.numFailingTests > 0 ? onError(new Error(result.errorMessage), test) : onResult(test, result), );