fix: issue with trailing slash in matching coverageThreshold keys

jestjs#12703
wespickett · Apr 21, 2022 · 4832d23 · j3tan · Apr 21, 2022 · j3tan
1 parent a293b75
commit 4832d23
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@jest/console": "^28.0.0-alpha.9",
-    "@jest/reporters": "^28.0.0-alpha.11",
+    "@jest/reporters": "^28.0.0-alpha.12",
     "@jest/test-result": "^28.0.0-alpha.9",
     "@jest/transform": "^28.0.0-alpha.11",
     "@jest/types": "^28.0.0-alpha.9",

diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@jest/reporters",
   "description": "Jest's reporters",
-  "version": "28.0.0-alpha.11",
+  "version": "28.0.0-alpha.12",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "exports": {

diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts
@@ -269,7 +269,7 @@ export default class CoverageReporter extends BaseReporter {
         const pathOrGlobMatches = thresholdGroups.reduce<
           Array<[string, string]>
         >((agg, thresholdGroup) => {
-          const absoluteThresholdGroup = path.resolve(thresholdGroup);
+          const absoluteThresholdGroup = path.resolve(thresholdGroup) + (thresholdGroup.length > 1 && thresholdGroup[thresholdGroup.length - 1] === path.sep ? path.sep : '');
 
           // The threshold group might be a path:
 

diff --git a/packages/jest-reporters/src/__tests__/CoverageReporter.test.js b/packages/jest-reporters/src/__tests__/CoverageReporter.test.js
@@ -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,11 +376,14 @@ describe('onRunComplete', () => {
       {
         collectCoverage: true,
         coverageThreshold: {
+          './path-test/100pc_coverage_file.js': {
+            statements: 100,
+          },
           './path-test-files/100pc_coverage_file.js': {
             statements: 100,
           },
           global: {
-            statements: 50,
+            statements: 55.55,
           },
         },
       },

diff --git a/yarn.lock b/yarn.lock
@@ -2544,7 +2544,7 @@ __metadata:
   resolution: "@jest/core@workspace:packages/jest-core"
   dependencies:
     "@jest/console": ^28.0.0-alpha.9
-    "@jest/reporters": ^28.0.0-alpha.11
+    "@jest/reporters": ^28.0.0-alpha.12
     "@jest/test-result": ^28.0.0-alpha.9
     "@jest/test-sequencer": ^28.0.0-alpha.11
     "@jest/test-utils": ^28.0.0-alpha.9
@@ -2748,7 +2748,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@jest/reporters@^28.0.0-alpha.11, @jest/reporters@workspace:packages/jest-reporters":
+"@jest/reporters@^28.0.0-alpha.12, @jest/reporters@workspace:packages/jest-reporters":
   version: 0.0.0-use.local
   resolution: "@jest/reporters@workspace:packages/jest-reporters"
   dependencies: