From fd09adb58d2efcecf838bfcff5fddb2315ad1c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Sat, 7 Jul 2018 18:49:56 +0200 Subject: [PATCH 1/4] Make travis wait 20mins instead of 10 for no output --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58da28977333..b44e4372eed0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ cache: - "node_modules" script: - - yarn run test-ci-partial + - travis_wait 20 yarn run test-ci-partial From d89fadf69bbf8f8250a19e575d0f715da1a997f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Sat, 7 Jul 2018 19:01:48 +0200 Subject: [PATCH 2/4] use jest-dot-reporter instead of jest-silent-reporter (sorry Rick) --- .travis.yml | 2 +- package.json | 2 +- yarn.lock | 49 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index b44e4372eed0..58da28977333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ cache: - "node_modules" script: - - travis_wait 20 yarn run test-ci-partial + - yarn run test-ci-partial diff --git a/package.json b/package.json index 4fc03a421978..b4736db36e37 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "istanbul-api": "^1.3.1", "istanbul-lib-coverage": "^1.0.0", "jasmine-reporters": "^2.2.0", + "jest-dot-reporter": "^1.0.3", "jest-junit": "^5.1.0", - "jest-silent-reporter": "^0.0.5", "jquery": "^3.2.1", "karma": "^2.0.0", "karma-browserify": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index ed9723381c48..b6efabfe6263 100644 --- a/yarn.lock +++ b/yarn.lock @@ -286,7 +286,7 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -2032,17 +2032,17 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" +chalk@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" dependencies: - ansi-styles "^3.2.1" + ansi-styles "^3.1.0" escape-string-regexp "^1.0.5" - supports-color "^5.3.0" + supports-color "^4.0.0" -chalk@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -5047,6 +5047,10 @@ has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6083,6 +6087,14 @@ jest-docblock@^21, jest-docblock@^21.0.0, jest-docblock@^21.2.0: version "21.2.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414" +jest-dot-reporter@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/jest-dot-reporter/-/jest-dot-reporter-1.0.3.tgz#aeee7b89f762f78d3ae8df9c8529cf37087a0321" + dependencies: + chalk "2.1.0" + moment "2.18.1" + progress "2.0.0" + jest-environment-jsdom@^22.4.1: version "22.4.3" resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e" @@ -6171,13 +6183,6 @@ jest-resolve@^22.4.2: browser-resolve "^1.11.2" chalk "^2.0.1" -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" - dependencies: - chalk "^2.3.1" - jest-util "^23.0.0" - jest-snapshot@^22.4.0: version "22.4.3" resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" @@ -7376,6 +7381,10 @@ module-deps@^6.0.0: through2 "^2.0.0" xtend "^4.0.0" +moment@2.18.1: + version "2.18.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" + moment@^2.6.0: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" @@ -8539,7 +8548,7 @@ process@~0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" -progress@^2.0.0: +progress@2.0.0, progress@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" @@ -10422,6 +10431,12 @@ supports-color@^3.1.2, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" +supports-color@^4.0.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" From 1e4f695f57e5cb726e6c1e7ee6c090ae2729beff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Sat, 7 Jul 2018 19:04:13 +0200 Subject: [PATCH 3/4] update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b4736db36e37..abf9209edc57 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,8 @@ "postinstall": "opencollective postinstall && yarn build", "publish": "yarn build-clean && yarn build && lerna publish --silent", "test-ci-es5-build-in-browser": "karma start --single-run", - "test-ci": "yarn jest-coverage -i --reporters jest-silent-reporter jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov", - "test-ci-partial": "yarn jest -i --reporters jest-silent-reporter jest-junit", + "test-ci": "yarn jest-coverage -i --reporters jest-dot-reporter jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov", + "test-ci-partial": "yarn jest -i --reporters jest-dot-reporter jest-junit", "test-pretty-format-perf": "node packages/pretty-format/perf/test.js", "test-leak": "yarn jest -i --detectLeaks jest-mock jest-diff jest-repl", "test": "yarn typecheck && yarn lint && yarn jest", From 23e20263b4cbd48bfc46a45dd3edc69f69a47b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Sat, 7 Jul 2018 19:15:04 +0200 Subject: [PATCH 4/4] use simple-dot-reporter --- package.json | 6 +-- .../src/__tests__/script_transformer.test.js | 2 +- yarn.lock | 38 +++---------------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index abf9209edc57..719fa9c832f9 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "istanbul-api": "^1.3.1", "istanbul-lib-coverage": "^1.0.0", "jasmine-reporters": "^2.2.0", - "jest-dot-reporter": "^1.0.3", "jest-junit": "^5.1.0", + "jest-simple-dot-reporter": "^1.0.2", "jquery": "^3.2.1", "karma": "^2.0.0", "karma-browserify": "^5.1.1", @@ -90,8 +90,8 @@ "postinstall": "opencollective postinstall && yarn build", "publish": "yarn build-clean && yarn build && lerna publish --silent", "test-ci-es5-build-in-browser": "karma start --single-run", - "test-ci": "yarn jest-coverage -i --reporters jest-dot-reporter jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov", - "test-ci-partial": "yarn jest -i --reporters jest-dot-reporter jest-junit", + "test-ci": "yarn jest-coverage -i --reporters jest-simple-dot-reporter jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov", + "test-ci-partial": "yarn jest -i --reporters jest-simple-dot-reporter jest-junit", "test-pretty-format-perf": "node packages/pretty-format/perf/test.js", "test-leak": "yarn jest -i --detectLeaks jest-mock jest-diff jest-repl", "test": "yarn typecheck && yarn lint && yarn jest", diff --git a/packages/jest-runtime/src/__tests__/script_transformer.test.js b/packages/jest-runtime/src/__tests__/script_transformer.test.js index a9227914c534..cd867cf1deba 100644 --- a/packages/jest-runtime/src/__tests__/script_transformer.test.js +++ b/packages/jest-runtime/src/__tests__/script_transformer.test.js @@ -394,7 +394,7 @@ describe('ScriptTransformer', () => { const content = 'var x = 1;\n' + '//# sourceMappingURL=data:application/json;base64,' + - new Buffer(sourceMap).toString('base64'); + Buffer.from(sourceMap).toString('base64'); require('preprocessor-with-sourcemaps').process.mockReturnValue(content); diff --git a/yarn.lock b/yarn.lock index b6efabfe6263..632c10d86428 100644 --- a/yarn.lock +++ b/yarn.lock @@ -286,7 +286,7 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -2032,14 +2032,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" @@ -5047,10 +5039,6 @@ has-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6087,14 +6075,6 @@ jest-docblock@^21, jest-docblock@^21.0.0, jest-docblock@^21.2.0: version "21.2.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414" -jest-dot-reporter@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/jest-dot-reporter/-/jest-dot-reporter-1.0.3.tgz#aeee7b89f762f78d3ae8df9c8529cf37087a0321" - dependencies: - chalk "2.1.0" - moment "2.18.1" - progress "2.0.0" - jest-environment-jsdom@^22.4.1: version "22.4.3" resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e" @@ -6183,6 +6163,10 @@ jest-resolve@^22.4.2: browser-resolve "^1.11.2" chalk "^2.0.1" +jest-simple-dot-reporter@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jest-simple-dot-reporter/-/jest-simple-dot-reporter-1.0.2.tgz#3af57740a1a4e63358d1718c9dad2aefe6196bbc" + jest-snapshot@^22.4.0: version "22.4.3" resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" @@ -7381,10 +7365,6 @@ module-deps@^6.0.0: through2 "^2.0.0" xtend "^4.0.0" -moment@2.18.1: - version "2.18.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" - moment@^2.6.0: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" @@ -8548,7 +8528,7 @@ process@~0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" -progress@2.0.0, progress@^2.0.0: +progress@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" @@ -10431,12 +10411,6 @@ supports-color@^3.1.2, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"