From 7c0b209c6262d6c8f46dec6e4a76648731365b65 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 17 Oct 2018 09:29:08 +0200 Subject: [PATCH 1/2] Revert "Re-enable jest-silent-reporter #hacktoberfest" --- .travis.yml | 12 ++++++------ appveyor.yml | 3 +-- azure-pipelines.yml | 10 ++++------ package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e1d12974f3..184cf5ee220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,27 +22,27 @@ matrix: include: - os: linux node_js: "10" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=basic + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic stage: basic - os: linux node_js: "10" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=lint-unit + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit stage: advanced - os: linux node_js: "10" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=integration + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration stage: advanced - os: osx node_js: "10" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=integration + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration stage: versions - os: linux node_js: "8" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=integration + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration stage: versions - os: linux node_js: "6" - env: NO_WATCH_TESTS=1 JEST_SILENT_REPORTER_DOTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache --reporters jest-silent-reporter" JOB_PART=integration + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration stage: versions fast_finish: true allow_failures: diff --git a/appveyor.yml b/appveyor.yml index 163cad51cde..94ecae79a7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,8 +27,7 @@ matrix: test_script: - node --version - yarn --version - - cmd: set JEST_SILENT_REPORTER_DOTS=1 - - cmd: set JEST=--maxWorkers=2 --cacheDirectory .jest-cache --reporters=jest-silent-reporter + - cmd: set JEST=--maxWorkers=2 --cacheDirectory .jest-cache - cmd: yarn appveyor:integration - cmd: yarn istanbul report --report lcovonly - cmd: yarn unlink webpack diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 19ed5cde3c9..cc862765cff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,14 +96,13 @@ jobs: displayName: "Install dependencies" - script: | set -e - set JEST_SILENT_REPORTER_DOTS=1 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" yarn cover:init - yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 --reporters=jest-silent-reporter + yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 mv coverage/coverage-final.json coverage/coverage-final-1.json - yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 --reporters=jest-silent-reporter + yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 mv coverage/coverage-final.json coverage/coverage-final-2.json - yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 --reporters=jest-silent-reporter + yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 mv coverage/coverage-final.json coverage/coverage-final-3.json displayName: "Run tests with coverage" - job: macos @@ -189,6 +188,5 @@ jobs: displayName: "Install dependencies" - script: | set -e - set JEST_SILENT_REPORTER_DOTS=1 - yarn cover:init && yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 --reporters=jest-silent-reporter && move coverage\\coverage-final.json coverage\\coverage-final-1.json && yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 --reporters=jest-silent-reporter && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 --reporters=jest-silent-reporter && move coverage\\coverage-final.json coverage\\coverage-final-3.json + yarn cover:init && yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-1.json && yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-3.json displayName: "Run tests with coverage" diff --git a/package.json b/package.json index a47861d4d3e..151725958ee 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "jade": "^1.11.0", "jade-loader": "~0.8.0", "jest": "^23.4.1", - "jest-silent-reporter": "^0.1.1", + "jest-silent-reporter": "^0.0.5", "json-loader": "^0.5.7", "json-schema-to-typescript": "^6.0.1", "less": "^2.5.1", diff --git a/yarn.lock b/yarn.lock index 0f398821e39..be23fb20317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4160,10 +4160,10 @@ jest-serializer@^23.0.1: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU= -jest-silent-reporter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jest-silent-reporter/-/jest-silent-reporter-0.1.1.tgz#2580704abf6245009f486fbea68f697dd7db2f48" - integrity sha512-nrRzOV4151hG354tnVWfyZbFGJdylpadRWYWWPSD+WeOz2hQOjUGxvIFODnaY9cKQ7JWCtG+5LgSss22ccRhBg== +jest-silent-reporter@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/jest-silent-reporter/-/jest-silent-reporter-0.0.5.tgz#14139b7a991b7bcca880dd8a69c33a91723a8f1f" + integrity sha512-LWNEJEeI9jbqOaNyqmnLWyEJXaNlDMCDqX6NbY89pzgerb3iExky56zD5oBvh+nvgzEND9cjL57EhifaAJBhjw== dependencies: chalk "^2.3.1" jest-util "^23.0.0" From fadf875d1294b3a629ea28ffc98cdbe3b05288c9 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 17 Oct 2018 09:40:20 +0200 Subject: [PATCH 2/2] remove dependency --- package.json | 1 - yarn.lock | 34 +--------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/package.json b/package.json index 151725958ee..bdc45b56dd4 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "jade": "^1.11.0", "jade-loader": "~0.8.0", "jest": "^23.4.1", - "jest-silent-reporter": "^0.0.5", "json-loader": "^0.5.7", "json-schema-to-typescript": "^6.0.1", "less": "^2.5.1", diff --git a/yarn.lock b/yarn.lock index be23fb20317..e1619fcdfb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4060,17 +4060,6 @@ jest-matcher-utils@^23.2.0: jest-get-type "^22.1.0" pretty-format "^23.2.0" -jest-message-util@^23.0.0: - version "23.3.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.3.0.tgz#bc07b11cec6971fb5dd9de2dfb60ebc22150c160" - integrity sha1-vAexHOxpcftd2d4t+2DrwiFQwWA= - dependencies: - "@babel/code-frame" "^7.0.0-beta.35" - chalk "^2.0.1" - micromatch "^3.1.10" - slash "^1.0.0" - stack-utils "^1.0.1" - jest-message-util@^23.4.0: version "23.4.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f" @@ -4160,14 +4149,6 @@ jest-serializer@^23.0.1: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU= -jest-silent-reporter@^0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/jest-silent-reporter/-/jest-silent-reporter-0.0.5.tgz#14139b7a991b7bcca880dd8a69c33a91723a8f1f" - integrity sha512-LWNEJEeI9jbqOaNyqmnLWyEJXaNlDMCDqX6NbY89pzgerb3iExky56zD5oBvh+nvgzEND9cjL57EhifaAJBhjw== - dependencies: - chalk "^2.3.1" - jest-util "^23.0.0" - jest-snapshot@^23.4.1: version "23.4.1" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.1.tgz#090de9acae927f6a3af3005bda40d912b83e9c96" @@ -4185,19 +4166,6 @@ jest-snapshot@^23.4.1: pretty-format "^23.2.0" semver "^5.5.0" -jest-util@^23.0.0: - version "23.0.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.1.tgz#68ea5bd7edb177d3059f9797259f8e0dacce2f99" - integrity sha1-aOpb1+2xd9MFn5eXJZ+ODazOL5k= - dependencies: - callsites "^2.0.0" - chalk "^2.0.1" - graceful-fs "^4.1.11" - is-ci "^1.0.10" - jest-message-util "^23.0.0" - mkdirp "^0.5.1" - source-map "^0.6.0" - jest-util@^23.4.0: version "23.4.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561" @@ -4895,7 +4863,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==