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.

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 --coverage with --findRelatedTests overwriting collectCoverageFrom options #6736

Merged
merged 7 commits into from
Aug 1, 2018
Merged

Fix --coverage with --findRelatedTests overwriting collectCoverageFrom options #6736

merged 7 commits into from
Aug 1, 2018

Conversation

stipsan
Copy link
Contributor

@stipsan stipsan commented Jul 22, 2018

Summary

Fixes #6462 by adding a check to the collectCoverage + findRelatedTests normalization.
If there's collectCoverageFrom patterns defined in the config it'll reduce (map + filter) to ensure that the generated patterns do not override existing patterns.

It is also no longer overwritten, existing patterns are merged with the dynamic ones.

Test plan

Expand upon the existing --findRelatedTests to cover the specific edge cases related to collectCoverageFrom patterns.

@stipsan stipsan changed the title Fix --coverage with --findRelatedTests Fix --coverage with --findRelatedTests overwriting collectCoverageFrom options Jul 22, 2018
@stipsan
Copy link
Contributor Author

stipsan commented Jul 22, 2018

Not sure why the test is reporting a memory leak in jest-diff given that there's no related changes to that 🤔

@codecov-io
Copy link

codecov-io commented Jul 22, 2018

Codecov Report

Merging #6736 into master will decrease coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6736      +/-   ##
==========================================
- Coverage   63.68%   63.65%   -0.03%     
==========================================
  Files         235      235              
  Lines        9007     9014       +7     
  Branches        4        4              
==========================================
+ Hits         5736     5738       +2     
- Misses       3270     3275       +5     
  Partials        1        1
Impacted Files Coverage Δ
packages/jest-config/src/normalize.js 91.33% <100%> (-1.78%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a10bc90...427cffe. Read the comment docs.

SimenB
SimenB previously requested changes Jul 25, 2018
Copy link
Member

@SimenB SimenB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix! Mind updating the changelog as well? 🙂

@stipsan
Copy link
Contributor Author

stipsan commented Jul 25, 2018

@SimenB done 👍

@stipsan
Copy link
Contributor Author

stipsan commented Aug 1, 2018

Anything left that might prevent this PR from landing? 😄

@aaronabramov aaronabramov merged commit 609f385 into jestjs:master Aug 1, 2018
@stipsan stipsan deleted the fix-coverage-with-findRelatedTests branch August 1, 2018 19:13
thymikee added a commit to rhysawilliams2010/jest that referenced this pull request Aug 8, 2018
* upstream/master: (122 commits)
  fix: don't report promises as open handles (jestjs#6716)
  support serializing `DocumentFragment` (jestjs#6705)
  Allow test titles to include array index (jestjs#6414)
  fix `toContain` suggest to contain equal message (jestjs#6810)
  fix: testMatch not working with negations (jestjs#6648)
  Add test cases for jestjs#6744 (jestjs#6772)
  print stack trace on calls to process.exit (jestjs#6714)
  Updates SnapshotTesting.md to provide more info. on snapshot scope (jestjs#6735)
  Mark snapshots as obsolete when moved to an inline snapshot (jestjs#6773)
  [Docs] Clarified the use of literal values as property matchers in toMatchSnapshot() (jestjs#6807)
  Update CHANGELOG.md (jestjs#6799)
  fix changelog entry that is not in 23.4.2 (jestjs#6796)
  Fix --coverage with --findRelatedTests overwriting collectCoverageFrom options (jestjs#6736)
  Update testURL default value from about:blank to localhost (jestjs#6792)
  fix: `matchInlineSnapshot` when prettier dependencies are mocked (jestjs#6776)
  Fix retryTimes and add e2e regression test (jestjs#6762)
  Release v23.4.2
  Docs/ExpectAPI: Correct docs for `objectContaining` (jestjs#6754)
  chore(packages/babel-jest) readme (jestjs#6746)
  docs: noted --coverage aliased by --collectCoverage (jestjs#6741)
  ...
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Jest 23 coverage failure for findRelatedTests
6 participants