jest --changedFilesToContributeTo=origin/master #5188

alsuren · 2017-12-27T22:10:36Z

Summary

I often have jest --watch running in a window, but sometimes I forget to look at it before committing, or I stage a bunch of changes that break tests, and it hides them from the test runner. This means that I often get surprised by CI test failures when I come to open pull requests.

This change allows you to write jest --watch --changedFilesSinceCommit=$LAST_MERGE_COMMIT to test your entire feature branch, but not the whole project.

LAST_MERGE_COMMIT can be written as HEAD^{/^Merge} or `git log --date-order --merges -1 --format=%H` on projects that use merge commits. On projects like jest that use linearised history, you might be able to get away with something like `git log --oneline --cherry --format=%H origin/master...HEAD | tail -n1`^ but I don't work on them often enough to know.

Test plan

I still need to write some integration tests for this (see TODO below) but I wanted to float the idea and get feedback before I got too invested in it.

To test this against the jest repo on my local machine, I have been running yarn run watch in one window, and yarn jest -- --onlyChanged --changedFilesSinceCommit=HEAD^^^^^^^^^ (if I add more ^s then I get more test suites run in my Test Suites: n passed, n total output.

TODO (feel free to add more):

integration test coverage
hg support (although git support didn't stop --changedFilesWithAncestor from being merged, by the look of it. Is this a requirement for merging, or is it enough to just explode gracefully?)
find a better name than --changedFilesSinceCommit (--changedFilesSinceRevision or something else?)
find a better name than findChangedFilesUsingCommand()?

facebook-github-bot · 2017-12-27T22:11:04Z

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need the corporate CLA signed.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

facebook-github-bot · 2017-12-27T22:20:10Z

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

SimenB · 2017-12-27T22:41:45Z

packages/jest-changed-files/src/git.js

+    child.stdout.on('data', data => (stdout += data));
+    child.stderr.on('data', data => (stderr += data));
+    child.on('error', e => reject(e));
+    child.on('close', code => {


wow, we really should use execa or something...

Is this a refactor that you want me to include in my bug fix branch, or is it okay to just move the existing code about unchanged for now, and and backlog the execa change for later?

(git grep shows it up as a dependency of os-locale and lerna in yarn.lock, but isn't used directly by jest anywhere)

Sticking it in the backlog is no problem at all, and will keep this PR focused. So just keep the child_process stuff for now 🙂

SimenB · 2017-12-27T22:43:11Z

types/ChangedFiles.js

@@ -12,6 +12,7 @@ import type {Path} from 'types/Config';
 export type Options = {|
  lastCommit?: boolean,
  withAncestor?: boolean,
+  sinceCommit?: ?string,


? on both sides, does that mean anything? Ref #5176 (comment)

SimenB · 2017-12-27T22:44:32Z

packages/jest-cli/src/cli/args.js

  changedFilesWithAncestor: {
    description:
      'When used together with `--onlyChanged`, it runs tests ' +
-      'related to the current changes and the changes made in the last commit. ' +
-      '(NOTE: this only works for hg repos)',


Can this fix (thanks :D) be in a separate PR?

Sure. I'll have a go at extracting it tomorrow (it's getting late here though).

... okay so it turned out to be easier than I thought (#5189) but I am genuinely off to bed now.

codecov-io · 2017-12-27T22:45:47Z

Codecov Report

Merging #5188 into master will decrease coverage by <.01%.
The diff coverage is 80%.

@@            Coverage Diff             @@
##           master    #5188      +/-   ##
==========================================
- Coverage   61.23%   61.23%   -0.01%     
==========================================
  Files         205      205              
  Lines        6891     6896       +5     
  Branches        4        3       -1     
==========================================
+ Hits         4220     4223       +3     
- Misses       2670     2672       +2     
  Partials        1        1

Impacted Files	Coverage Δ
packages/jest-config/src/valid_config.js	`100% <ø> (ø)`	⬆️
packages/jest-config/src/index.js	`25.92% <ø> (ø)`	⬆️
packages/jest-cli/src/get_changed_files_promise.js	`100% <ø> (ø)`	⬆️
packages/jest-config/src/normalize.js	`93.1% <ø> (ø)`	⬆️
packages/jest-changed-files/src/hg.js	`28.12% <0%> (-1.88%)`	⬇️
packages/jest-changed-files/src/git.js	`94.44% <100%> (+0.5%)`	⬆️

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 6e788b1...933e33a. Read the comment docs.

SimenB · 2017-12-27T22:46:41Z

I think this is a great idea! 🎉

The todos in the OP look fine to me.

Regarding mercurial support, I don't think it should be a blocker, but if you're able to add support for it, that would be great.

cpojer · 2018-01-06T10:47:55Z

Can you rebase this and resolve the conflicts? Bonus points if you can also make this work for Mercurial before we merge this so that we keep consistency for people :)

alsuren · 2018-01-06T19:08:12Z

packages/jest-changed-files/src/hg.js

+        throw new Error(
+          '`changedFilesSinceCommit` is not supported in hg repos.',
+        );
+      }
      let args = ['status', '-amnu'];
      if (options && options.withAncestor) {
        args.push('--rev', 'ancestor(.^)');


I've asked a friend who actually understands hg to help me with making hg work. I pity the fool that tries to use this option in a mixed hg and git environment when it's finished though.

alsuren · 2018-01-13T00:23:38Z

I realised that actually I always want all changes that are included in HEAD and the working tree but not in the tree from $sinceCommit. This should stop users from relying on awkward constructs like HEAD^{/^Merge}, and allow them to specify something understandable like origin/master instead.

I will have a go at fixing the tests tomorrow.
I will also open another PR to make --lastCommit etc. imply --onlyChanged.
Now that I've changed the semantics, --changedFilesSinceCommit sounds even more terrible. Suggestions welcome.

alsuren · 2018-01-14T17:39:37Z

I fixed all the tests and conflicts, and cherry-picked #5307 (to preemptively resolve conflicts, because I wanted its functionality). I also settled on --changedFilesToContributeTo as a better name.

I think I'm pretty happy with the code at this point, so should be ready to review now, unless you'd prefer to review #5307 first (test failures look like permissions problems on the server, I think).

…hanged

make changedFilesToContributeTo require an arg, and imply onlyChanged

SimenB · 2018-01-15T08:57:18Z

--changedFilesToContributeTo is pretty verbose, what about just --changedSince?

cpojer · 2018-01-15T10:10:12Z

Closing this one in favor of the duplicate.

github-actions · 2021-05-12T23:07:14Z

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.

facebook-github-bot added the CLA Signed ✔️ label Dec 27, 2017

SimenB reviewed Dec 27, 2017

View reviewed changes

alsuren mentioned this pull request Dec 27, 2017

Git support for --changedFilesWithAncestor #5189

Merged

alsuren force-pushed the changed-files-refactor branch from 0b61468 to b5d751c Compare January 6, 2018 18:24

alsuren commented Jan 6, 2018

View reviewed changes

alsuren force-pushed the changed-files-refactor branch from 57a7181 to 933e33a Compare January 14, 2018 15:06

alsuren changed the title ~~WIP on jest --onlyChanged --changedFilesSinceCommit=$LAST_MERGE_COMMIT~~ jest --changedFilesToContributeTo=origin/master Jan 14, 2018

alsuren force-pushed the changed-files-refactor branch from c38eab0 to b637af5 Compare January 14, 2018 17:35

alsuren added 3 commits January 14, 2018 20:52

make --lastCommit and --changedFilesWithAncestor work without --onlyC…

6b750e0

…hanged

add fix to changelog

31fd272

--changedFilesToContributeTo=$BRANCH

0ba2431

make changedFilesToContributeTo require an arg, and imply onlyChanged

alsuren force-pushed the changed-files-refactor branch from b637af5 to 0ba2431 Compare January 15, 2018 08:10

alsuren mentioned this pull request Jan 15, 2018

jest --changedSince=origin/master #5312

Merged

cpojer closed this Jan 15, 2018

github-actions bot locked as resolved and limited conversation to collaborators May 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

jest --changedFilesToContributeTo=origin/master #5188

jest --changedFilesToContributeTo=origin/master #5188

alsuren commented Dec 27, 2017 •

edited

Loading

facebook-github-bot commented Dec 27, 2017

facebook-github-bot commented Dec 27, 2017

SimenB Dec 27, 2017

alsuren Dec 27, 2017

SimenB Dec 27, 2017

SimenB Dec 27, 2017

SimenB Dec 27, 2017

alsuren Dec 27, 2017

alsuren Dec 27, 2017

codecov-io commented Dec 27, 2017 •

edited

Loading

SimenB commented Dec 27, 2017

cpojer commented Jan 6, 2018

alsuren Jan 6, 2018

alsuren commented Jan 13, 2018 •

edited

Loading

alsuren commented Jan 14, 2018 •

edited

Loading

SimenB commented Jan 15, 2018

cpojer commented Jan 15, 2018

github-actions bot commented May 12, 2021

jest --changedFilesToContributeTo=origin/master #5188

jest --changedFilesToContributeTo=origin/master #5188

Conversation

alsuren commented Dec 27, 2017 • edited Loading

facebook-github-bot commented Dec 27, 2017

facebook-github-bot commented Dec 27, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Dec 27, 2017 • edited Loading

Codecov Report

SimenB commented Dec 27, 2017

cpojer commented Jan 6, 2018

Choose a reason for hiding this comment

alsuren commented Jan 13, 2018 • edited Loading

alsuren commented Jan 14, 2018 • edited Loading

SimenB commented Jan 15, 2018

cpojer commented Jan 15, 2018

github-actions bot commented May 12, 2021

alsuren commented Dec 27, 2017 •

edited

Loading

codecov-io commented Dec 27, 2017 •

edited

Loading

alsuren commented Jan 13, 2018 •

edited

Loading

alsuren commented Jan 14, 2018 •

edited

Loading