Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sourcemaps #3458

Merged
merged 10 commits into from
Oct 9, 2017
Merged

Sourcemaps #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ab8f14
Allow transformers to specify source maps even if not using coverage
felipeochoa May 3, 2017
69df22b
Test the new source map behavior
felipeochoa May 3, 2017
fffc59b
Install source-map-support into jasmine runtime
felipeochoa May 3, 2017
bc671c7
Add tests for sourcemap support
felipeochoa May 3, 2017
3cdcecd
update source map cache test to use writeFileAtomic
felipeochoa Oct 4, 2017
85f4bcf
move up source-map-support to top-level dependency
felipeochoa Oct 4, 2017
35e4743
Update snapshot
SimenB Oct 8, 2017
08e6a0f
Fix lint errors
SimenB Oct 8, 2017
c51cf2c
move source-map-support into jest-jasmine2 package.json
felipeochoa Oct 9, 2017
4269625
remove hash from coverage_remapping integration test snapshot
felipeochoa Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 63 additions & 55 deletions integration_tests/__tests__/__snapshots__/coverage_remapping.test.js.snap
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
exports[`maps code coverage against original source 1`] = ` exports[`maps code coverage against original source 1`] = `
Object { Object {
"covered.ts": Object { "covered.ts": Object {
"_coverageSchema": "332fd63041d2c1bcb487cc26dd0d5f7d97098a6c",
"b": Object { "b": Object {
"0": Array [ "0": Array [
1, 1,
Expand All @@ -24,149 +25,153 @@ Object {
}, },
"branchMap": Object { "branchMap": Object {
"0": Object { "0": Object {
"line": 4,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 9, "column": 11,
"line": 5, "line": 6,
}, },
"start": Object { "start": Object {
"column": 8, "column": 18,
"line": 5, "line": 4,
}, },
}, },
"locations": Array [ "locations": Array [
Object { Object {
"end": Object { "end": Object {
"column": 9, "column": 11,
"line": 5, "line": 5,
}, },
"start": Object { "start": Object {
"column": 8, "column": 10,
"line": 5, "line": 5,
}, },
}, },
Object { Object {
"end": Object { "end": Object {
"column": 9, "column": 11,
"line": 6, "line": 6,
}, },
"start": Object { "start": Object {
"column": 8, "column": 10,
"line": 6, "line": 6,
}, },
}, },
], ],
"type": "cond-expr", "type": "cond-expr",
}, },
"1": Object { "1": Object {
"line": 7,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 37, "column": 30,
"line": 7, "line": 7,
}, },
"start": Object { "start": Object {
"column": 36, "column": 18,
"line": 7, "line": 7,
}, },
}, },
"locations": Array [ "locations": Array [
Object { Object {
"end": Object { "end": Object {
"column": 37, "column": 26,
"line": 7, "line": 7,
}, },
"start": Object { "start": Object {
"column": 36, "column": 25,
"line": 7, "line": 7,
}, },
}, },
Object { Object {
"end": Object { "end": Object {
"column": 41, "column": 30,
"line": 7, "line": 7,
}, },
"start": Object { "start": Object {
"column": 40, "column": 29,
"line": 7, "line": 7,
}, },
}, },
], ],
"type": "cond-expr", "type": "cond-expr",
}, },
"2": Object { "2": Object {
"line": 8,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 33, "column": 39,
"line": 8, "line": 8,
}, },
"start": Object { "start": Object {
"column": 29, "column": 18,
"line": 8, "line": 8,
}, },
}, },
"locations": Array [ "locations": Array [
Object { Object {
"end": Object { "end": Object {
"column": 33, "column": 22,
"line": 8, "line": 8,
}, },
"start": Object { "start": Object {
"column": 29, "column": 18,
"line": 8, "line": 8,
}, },
}, },
Object { Object {
"end": Object { "end": Object {
"column": 41, "column": 30,
"line": 8, "line": 8,
}, },
"start": Object { "start": Object {
"column": 37, "column": 26,
"line": 8, "line": 8,
}, },
}, },
Object { Object {
"end": Object { "end": Object {
"column": 50, "column": 39,
"line": 8, "line": 8,
}, },
"start": Object { "start": Object {
"column": 45, "column": 34,
"line": 8, "line": 8,
}, },
}, },
], ],
"type": "binary-expr", "type": "binary-expr",
}, },
"3": Object { "3": Object {
"line": 9,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 42, "column": 79,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 32, "column": 13,
"line": 9, "line": 9,
}, },
}, },
"locations": Array [ "locations": Array [
Object { Object {
"end": Object { "end": Object {
"column": 42, "column": 48,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 32, "column": 20,
"line": 9, "line": 9,
}, },
}, },
Object { Object {
"end": Object { "end": Object {
"column": 55, "column": 79,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 45, "column": 51,
"line": 9, "line": 9,
}, },
}, },
Expand All @@ -183,21 +188,22 @@ Object {
"0": Object { "0": Object {
"decl": Object { "decl": Object {
"end": Object { "end": Object {
"column": 28, "column": 36,
"line": 3, "line": 3,
}, },
"start": Object { "start": Object {
"column": 9, "column": 26,
"line": 3, "line": 3,
}, },
}, },
"line": 3,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 1, "column": 1,
"line": 12, "line": 11,
}, },
"start": Object { "start": Object {
"column": 49, "column": 43,
"line": 3, "line": 3,
}, },
}, },
Expand All @@ -206,17 +212,18 @@ Object {
"1": Object { "1": Object {
"decl": Object { "decl": Object {
"end": Object { "end": Object {
"column": 37, "column": 21,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 32, "column": 20,
"line": 9, "line": 9,
}, },
}, },
"line": 9,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 42, "column": 48,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
Expand All @@ -229,21 +236,22 @@ Object {
"2": Object { "2": Object {
"decl": Object { "decl": Object {
"end": Object { "end": Object {
"column": 50, "column": 52,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 45, "column": 51,
"line": 9, "line": 9,
}, },
}, },
"line": 9,
"loc": Object { "loc": Object {
"end": Object { "end": Object {
"column": 55, "column": 79,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 45, "column": 63,
"line": 9, "line": 9,
}, },
}, },
Expand All @@ -264,8 +272,8 @@ Object {
"statementMap": Object { "statementMap": Object {
"0": Object { "0": Object {
"end": Object { "end": Object {
"column": 1, "column": 2,
"line": 12, "line": 11,
}, },
"start": Object { "start": Object {
"column": 0, "column": 0,
Expand All @@ -274,72 +282,72 @@ Object {
}, },
"1": Object { "1": Object {
"end": Object { "end": Object {
"column": 9, "column": 11,
"line": 6, "line": 6,
}, },
"start": Object { "start": Object {
"column": 29, "column": 18,
"line": 4, "line": 4,
}, },
}, },
"2": Object { "2": Object {
"end": Object { "end": Object {
"column": 41, "column": 30,
"line": 7, "line": 7,
}, },
"start": Object { "start": Object {
"column": 29, "column": 18,
"line": 7, "line": 7,
}, },
}, },
"3": Object { "3": Object {
"end": Object { "end": Object {
"column": 50, "column": 39,
"line": 8, "line": 8,
}, },
"start": Object { "start": Object {
"column": 29, "column": 18,
"line": 8, "line": 8,
}, },
}, },
"4": Object { "4": Object {
"end": Object { "end": Object {
"column": 55, "column": 79,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 25, "column": 13,
"line": 9, "line": 9,
}, },
}, },
"5": Object { "5": Object {
"end": Object { "end": Object {
"column": 42, "column": 46,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 38, "column": 34,
"line": 9, "line": 9,
}, },
}, },
"6": Object { "6": Object {
"end": Object { "end": Object {
"column": 55, "column": 77,
"line": 9, "line": 9,
}, },
"start": Object { "start": Object {
"column": 51, "column": 65,
"line": 9, "line": 9,
}, },
}, },
"7": Object { "7": Object {
"end": Object { "end": Object {
"column": 17, "column": 17,
"line": 11, "line": 10,
}, },
"start": Object { "start": Object {
"column": 4, "column": 4,
"line": 11, "line": 10,
}, },
}, },
}, },
Expand Down
1 change: 1 addition & 0 deletions integration_tests/__tests__/coverage_remapping.test.js
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ it('maps code coverage against original source', () => {
// reduce absolute paths embedded in the coverage map to just filenames // reduce absolute paths embedded in the coverage map to just filenames
Object.keys(coverageMap).forEach(filename => { Object.keys(coverageMap).forEach(filename => {
coverageMap[filename].path = path.basename(coverageMap[filename].path); coverageMap[filename].path = path.basename(coverageMap[filename].path);
delete coverageMap[filename].hash;
coverageMap[path.basename(filename)] = coverageMap[filename]; coverageMap[path.basename(filename)] = coverageMap[filename];
delete coverageMap[filename]; delete coverageMap[filename];
}); });
Expand Down
3 changes: 2 additions & 1 deletion packages/jest-jasmine2/package.json
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"jest-matcher-utils": "^21.2.1", "jest-matcher-utils": "^21.2.1",
"jest-message-util": "^21.2.1", "jest-message-util": "^21.2.1",
"jest-snapshot": "^21.2.1", "jest-snapshot": "^21.2.1",
"p-cancelable": "^0.3.0" "p-cancelable": "^0.3.0",
"source-map-support": "^0.5.0"
}, },
"devDependencies": { "devDependencies": {
"jest-runtime": "^21.2.1" "jest-runtime": "^21.2.1"
Expand Down
Loading