Skip to content

Commit

Permalink
Merge branch 'master' into uglier-inline-snapshots
Browse files Browse the repository at this point in the history 
* master:
  chore: bump deps (jestjs#10821)
  fix(reporters): make sure to handle empty files in v8 coverage (jestjs#10819)
  fix: add `watchAll` to Valid config (jestjs#10804)
  • Loading branch information
@jeysal
jeysal committed Nov 14, 2020
2 parents 36efffa + dbb1290 commit c53a579
Show file tree
Hide file tree
Showing 30 changed files with 1,102 additions and 867 deletions.
12 changes: 6 additions & 6 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions .yarn/releases/yarn-sources.cjs
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- `[jest-console]` `console.dir` now respects the second argument correctly ([#10638](https://github.com/facebook/jest/pull/10638))
- `[expect]` [**BREAKING**] Revise `expect.not.objectContaining()` to be the inverse of `expect.objectContaining()`, as documented. ([#10708](https://github.com/facebook/jest/pull/10708))
- `[jest-reporter]` Handle empty files when reporting code coverage with V8 ([#10819](https://github.com/facebook/jest/pull/10819))
- `[jest-resolve]` Replace read-pkg-up with escalade package ([#10781](https://github.com/facebook/jest/pull/10781))
- `[jest-runtime]` [**BREAKING**] Do not inject `global` variable into module wrapper ([#10644](https://github.com/facebook/jest/pull/10644))
- `[jest-runtime]` [**BREAKING**] remove long-deprecated `jest.addMatchers`, `jest.resetModuleRegistry`, and `jest.runTimersToTime` ([#9853](https://github.com/facebook/jest/pull/9853))
Expand Down
15 changes: 12 additions & 3 deletions e2e/__tests__/__snapshots__/v8Coverage.test.ts.snap
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`prints coverage 1`] = `
" console.log
exports[`prints coverage with empty sourcemaps 1`] = `
----------|---------|----------|---------|---------|-------------------
File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
----------|---------|----------|---------|---------|-------------------
All files | 100 | 100 | 100 | 100 |
types.ts | 100 | 100 | 100 | 100 |
----------|---------|----------|---------|---------|-------------------
`;

exports[`prints coverage with missing sourcemaps 1`] = `
console.log
42
at Object.log (__tests__/Thing.test.js:10:9)
Expand All @@ -12,5 +21,5 @@ File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
All files | 100 | 100 | 100 | 100 |
Thing.js | 100 | 100 | 100 | 100 |
x.css | 100 | 100 | 100 | 100 |
----------|---------|----------|---------|---------|-------------------"
----------|---------|----------|---------|---------|-------------------
`;
18 changes: 16 additions & 2 deletions e2e/__tests__/v8Coverage.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
*/

import * as path from 'path';
import wrap from 'jest-snapshot-serializer-raw';
import runJest from '../runJest';

const DIR = path.resolve(__dirname, '../v8-coverage');

test('prints coverage', () => {
test('prints coverage with missing sourcemaps', () => {
const sourcemapDir = path.join(DIR, 'no-sourcemap');

const {stdout, exitCode} = runJest(
Expand All @@ -20,5 +21,18 @@ test('prints coverage', () => {
);

expect(exitCode).toBe(0);
expect(stdout).toMatchSnapshot();
expect(wrap(stdout)).toMatchSnapshot();
});

test('prints coverage with empty sourcemaps', () => {
const sourcemapDir = path.join(DIR, 'empty-sourcemap');

const {stdout, exitCode} = runJest(
sourcemapDir,
['--coverage', '--coverage-provider', 'v8'],
{stripAnsi: true},
);

expect(exitCode).toBe(0);
expect(wrap(stdout)).toMatchSnapshot();
});
98 changes: 49 additions & 49 deletions e2e/async-regenerator/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ __metadata:
languageName: node
linkType: hard

"@babel/generator@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/generator@npm:7.12.1"
"@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.12.5":
version: 7.12.5
resolution: "@babel/generator@npm:7.12.5"
dependencies:
"@babel/types": ^7.12.1
"@babel/types": ^7.12.5
jsesc: ^2.5.1
source-map: ^0.5.0
checksum: e0f5f9af4f5e1ed3afd02a57b1f15a85c7adb7e4deafbda2534bb49d889d6443b1fb5494e4543e31525788db20e1426e4a89c8cbd0c55289a8fdc6da0a9700cf
checksum: 7706cb3d29060e6dfcdbc982ded9a02f0bda36329cc35aabc6b3f9f30ef7b3b3bcaba51c24714663f3ea9529994cd3461ab8a664b26398208b9b9a96476bf43c
languageName: node
linkType: hard

Expand Down Expand Up @@ -79,11 +79,11 @@ __metadata:
linkType: hard

"@babel/helper-module-imports@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/helper-module-imports@npm:7.12.1"
version: 7.12.5
resolution: "@babel/helper-module-imports@npm:7.12.5"
dependencies:
"@babel/types": ^7.12.1
checksum: 261205f2e2c8da282af7c402089af49add550116b330cc2e9191af349da5f7930893bf147fcb1324ce71f515a287899d67ca3e644a4c94b5a1487d9dbfcda3b0
"@babel/types": ^7.12.5
checksum: 7f63b03496f0d03dac33050e9f925b0b32c5acffb2f4f5bb5936431e5da3df03792f67033875005e00dd7a3b565ffc95b4af3da276ae6ff8f81d860d7acbfe65
languageName: node
linkType: hard

Expand Down Expand Up @@ -121,14 +121,14 @@ __metadata:
linkType: hard

"@babel/helper-replace-supers@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/helper-replace-supers@npm:7.12.1"
version: 7.12.5
resolution: "@babel/helper-replace-supers@npm:7.12.5"
dependencies:
"@babel/helper-member-expression-to-functions": ^7.12.1
"@babel/helper-optimise-call-expression": ^7.10.4
"@babel/traverse": ^7.12.1
"@babel/types": ^7.12.1
checksum: e745f78b48647975392517c64df9311308f1badec3ca911d21126ba2f3f4aa36b4c31ad42f4cba4813d5b44f6c0417b2649d2d9991332f881d59ff25ab32c2a2
"@babel/traverse": ^7.12.5
"@babel/types": ^7.12.5
checksum: 5a9ac871de38e65128e082bcca925298a4dd1501b1b79d79ebf7fc3c03490dcc1e397d582f513543f908f962dcb161a0ce4d968423b0c209c4321487bf2d5ec9
languageName: node
linkType: hard

Expand Down Expand Up @@ -158,13 +158,13 @@ __metadata:
linkType: hard

"@babel/helpers@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/helpers@npm:7.12.1"
version: 7.12.5
resolution: "@babel/helpers@npm:7.12.5"
dependencies:
"@babel/template": ^7.10.4
"@babel/traverse": ^7.12.1
"@babel/types": ^7.12.1
checksum: bbea976e6900dfe1c55bd8425ef982839650a1190859eae9a7cae737332b71375ea74e83863399d2941800142bdbe876829827907096d36685d7a980511c1d86
"@babel/traverse": ^7.12.5
"@babel/types": ^7.12.5
checksum: 5cc171461d6d38c3d46494e3b35c390ea051fc3a3406cdf378960c57a1656a8e1f799e7b00080a82552ebb1ee7054a1e648421eaf73f31ad12c12a03b0b42bc0
languageName: node
linkType: hard

Expand All @@ -179,12 +179,12 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.10.4, @babel/parser@npm:^7.12.1, @babel/parser@npm:^7.12.3":
version: 7.12.3
resolution: "@babel/parser@npm:7.12.3"
"@babel/parser@npm:^7.10.4, @babel/parser@npm:^7.12.3, @babel/parser@npm:^7.12.5":
version: 7.12.5
resolution: "@babel/parser@npm:7.12.5"
bin:
parser: ./bin/babel-parser.js
checksum: 3605bcf97e956ef36506ccb7e0ca4432025d8992c7e1f5d5b03976750a1198a0b27f461ab9304dbc5319a154b5ea19c09e72f87bfc5c08dd2780428734e13339
checksum: ff03d2389e32e3710c759d7bbcffc2d2e0637498e3a36aeaa0dbf961c48adb7027c393d0458247e54e24fed66ce0ea00e3e8d63089d22931e4175ee398727c15
languageName: node
linkType: hard

Expand Down Expand Up @@ -224,11 +224,11 @@ __metadata:
linkType: hard

"@babel/runtime@npm:^7.8.4":
version: 7.12.1
resolution: "@babel/runtime@npm:7.12.1"
version: 7.12.5
resolution: "@babel/runtime@npm:7.12.5"
dependencies:
regenerator-runtime: ^0.13.4
checksum: 979d1c099c386031f96a952ee903e7bc3c60ae6e4eefe2bf49e4224014542d4ac2b1e2fb708031da36501a3842d4442dfdab38ab359ab3f46634b3c7cb5f6c6e
checksum: 423fb0079353db2faa0dad0cbdf0a90fbc5b511d1f77e5645d1aa0b144a144e24502bb023c12a31d7dca63b6e16ae36afa59992f0404e92e21de211051c361e3
languageName: node
linkType: hard

Expand All @@ -243,31 +243,31 @@ __metadata:
languageName: node
linkType: hard

"@babel/traverse@npm:^7.12.1":
version: 7.12.1
resolution: "@babel/traverse@npm:7.12.1"
"@babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.12.5":
version: 7.12.5
resolution: "@babel/traverse@npm:7.12.5"
dependencies:
"@babel/code-frame": ^7.10.4
"@babel/generator": ^7.12.1
"@babel/generator": ^7.12.5
"@babel/helper-function-name": ^7.10.4
"@babel/helper-split-export-declaration": ^7.11.0
"@babel/parser": ^7.12.1
"@babel/types": ^7.12.1
"@babel/parser": ^7.12.5
"@babel/types": ^7.12.5
debug: ^4.1.0
globals: ^11.1.0
lodash: ^4.17.19
checksum: a3040d94b72ba4214dc63b3d5f3517874dc8a72991a4c6916f48b756567e20c53c796feca6340db6edad9d48e7a9075e351c9b8daa0ed179d498cb80865be9da
checksum: 86b9e0edbb61aeda7273920b3e99e9ae26aa61c77481081429c8340695166fdb2ce3afc2504d78e55a03f88a4e83fd8a651d569a948f3c8a4092d1d173facb8b
languageName: node
linkType: hard

"@babel/types@npm:^7.10.4, @babel/types@npm:^7.11.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.8.3":
version: 7.12.1
resolution: "@babel/types@npm:7.12.1"
"@babel/types@npm:^7.10.4, @babel/types@npm:^7.11.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.5, @babel/types@npm:^7.8.3":
version: 7.12.6
resolution: "@babel/types@npm:7.12.6"
dependencies:
"@babel/helper-validator-identifier": ^7.10.4
lodash: ^4.17.19
to-fast-properties: ^2.0.0
checksum: 0747b064093126e3ceba410c78e8ea438ed84cd68ad8abb2f98ffe88e2b600406096553bb5ef28cd40b29e68122820fe98e31ddfd0318fbb0efc2f4080d3417a
checksum: e8d02f859c16c8ae941a1eb84954189eacdd9488c8f9ad54c29dedf2bf8456f45c7fe401c54ea2c4d45d890d865aaac0283a78b62a87f796e92078eac49aa040
languageName: node
linkType: hard

Expand Down Expand Up @@ -379,12 +379,12 @@ __metadata:
languageName: node
linkType: hard

"is-core-module@npm:^2.0.0":
version: 2.0.0
resolution: "is-core-module@npm:2.0.0"
"is-core-module@npm:^2.1.0":
version: 2.1.0
resolution: "is-core-module@npm:2.1.0"
dependencies:
has: ^1.0.3
checksum: de99dfbdf14d254f6d078aa37113512295acef3cfff5fb39fdf8020b04788535eae6da39e02b0c4ad07f7bc79594de8d5aeb4fce66f97feb9c597d7d6d6d43d4
checksum: 6e9d45be21c607e5af4f0ff91e68f808c53cafb8729dc30425fc83dc2538ac2af65242752e4e5c5f75aac767cae6bd8bd1834a998931e1c236fb121f9bad7029
languageName: node
linkType: hard

Expand Down Expand Up @@ -460,22 +460,22 @@ __metadata:
linkType: hard

"resolve@^1.3.2, resolve@^1.8.1":
version: 1.18.1
resolution: "resolve@npm:1.18.1"
version: 1.19.0
resolution: "resolve@npm:1.19.0"
dependencies:
is-core-module: ^2.0.0
is-core-module: ^2.1.0
path-parse: ^1.0.6
checksum: deb5ba746e1c038ba8fb7ca5c35ee3fe88665e2f79be3e9a706e5254eeea55eb12b6f1830dd60a11bbafa327bcd868284fbf5caf428cf5761b3f094abdffee77
checksum: 8b23c7fde1224898ffb9fec2a2295a44d1564981343bdbf5fd3769465658f6a6f6647bb7ea66dfb3c1291ca86046b0233be2edfcd8ca05b38886521e8869677c
languageName: node
linkType: hard

"resolve@patch:resolve@^1.3.2#builtin<compat/resolve>, resolve@patch:resolve@^1.8.1#builtin<compat/resolve>":
version: 1.18.1
resolution: "resolve@patch:resolve@npm%3A1.18.1#builtin<compat/resolve>::version=1.18.1&hash=3388aa"
version: 1.19.0
resolution: "resolve@patch:resolve@npm%3A1.19.0#builtin<compat/resolve>::version=1.19.0&hash=3388aa"
dependencies:
is-core-module: ^2.0.0
is-core-module: ^2.1.0
path-parse: ^1.0.6
checksum: 9e62d2803ad1ec21b13780cc6a45b72bb7b6525eb5b44f0ede7cde37c00a8eb310c06ebfcc7de7dc10c2234d7d271bc4f1eed9783fb87acac141597cd4efaeec
checksum: 188d5167e8578a9af8d194faf382b8f3526aad5145391c24ecdc6246c6fc82c10fc66d6352267f8e93c5977c503d61803169c91b9e2ee36dd2de759915c9b673
languageName: node
linkType: hard

Expand Down
Loading

0 comments on commit c53a579

Please sign in to comment.