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

fix: issue with trailing slash in matching coverageThreshold keys #12714

Merged
merged 10 commits into from
Apr 27, 2022
+25 −2
Merged

fix: issue with trailing slash in matching coverageThreshold keys #12714

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a06da4
fix: issue with trailing slash in matching coverageThreshold keys
wespickett Apr 21, 2022
bc46f49
Update CHANGELOG.md
wespickett Apr 22, 2022
70954f8
Update CHANGELOG.md
SimenB Apr 23, 2022
3063896
fix: lint issues.
wespickett Apr 26, 2022
00db6a0
Merge branch 'fix-coverage-trailing-slash' of github.com:wespickett/j…
wespickett Apr 26, 2022
e581837
fix: cleanup logic.
wespickett Apr 26, 2022
95c69b4
fix: add windows specific case
wespickett Apr 26, 2022
8fadc01
Merge branch 'main' into fix-coverage-trailing-slash
SimenB Apr 27, 2022
7c352a2
move changelog entry
SimenB Apr 27, 2022
188c09d
Merge branch 'main' into fix-coverage-trailing-slash
SimenB Apr 27, 2022
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
Next Next commit
fix: issue with trailing slash in matching coverageThreshold keys 
#12703
@wespickett
wespickett committed Apr 22, 2022
commit 4a06da4533c9244a5c43a17e2c09803d51c714cf
5 changes: 4 additions & 1 deletion packages/jest-reporters/src/CoverageReporter.ts
View file
Original file line number Diff line number Diff line change
@@ -269,7 +269,10 @@ export default class CoverageReporter extends BaseReporter {
const pathOrGlobMatches = thresholdGroups.reduce<
Array<[string, string]>
>((agg, thresholdGroup) => {
const absoluteThresholdGroup = path.resolve(thresholdGroup);
// Preserve trailing slash, but not required if root dir
// See https://github.com/facebook/jest/issues/12703
const suffix = thresholdGroup.length > 1 && thresholdGroup.endsWith(path.sep) ? path.sep : '';
const absoluteThresholdGroup = `${path.resolve(thresholdGroup)}${suffix}`;

// The threshold group might be a path:

14 changes: 13 additions & 1 deletion packages/jest-reporters/src/__tests__/CoverageReporter.test.js
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,9 @@ beforeEach(() => {
'non_covered_file.js': '',
'relative_path_file.js': '',
};

fileTree[`${process.cwd()}/path-test`] = {
'100pc_coverage_file.js': '',
};
mock(fileTree);
});

@@ -79,6 +81,10 @@ describe('onRunComplete', () => {
statements: {covered: 5, pct: 50, skipped: 0, total: 10},
};
const fileCoverage = [
[
'./path-test/100pc_coverage_file.js',
{statements: {covered: 10, pct: 100, total: 10}},
],
['./path-test-files/covered_file_without_threshold.js'],
['./path-test-files/full_path_file.js'],
['./path-test-files/relative_path_file.js'],
@@ -306,6 +312,9 @@ describe('onRunComplete', () => {
{
collectCoverage: true,
coverageThreshold: {
'./path-test/': {
statements: 100,
},
'./path-test-files/': {
statements: 50,
},
@@ -367,6 +376,9 @@ describe('onRunComplete', () => {
{
collectCoverage: true,
coverageThreshold: {
'./path-test/100pc_coverage_file.js': {
statements: 100,
},
'./path-test-files/100pc_coverage_file.js': {
statements: 100,
},