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
Avoid stashing if no lint-staged files are changed (#570) #573
Merged
okonet
merged 6 commits into
lint-staged:master
from
silbinarywolf:fix/github-issue-570-stashing-non-linted-files
Feb 2, 2019
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
04aa58f
fix: add check for changed lint-staged files before stashing changes
silbinarywolf ec66acd
fix: simplify implementation, add comment as requested and remove "on…
silbinarywolf 316a7ed
fix: update test snapshot for "runAll should resolve the promise with…
silbinarywolf a106320
fix: replace Array.forEach with Array.every, add message if lint-stag…
silbinarywolf e7805f3
fix: remove "No linters executed" and "in lint-staged.linters" copy
silbinarywolf 162a7ff
Merge branch 'master' into fix/github-issue-570-stashing-non-linted-f…
okonet File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -161,4 +161,31 @@ describe('runAll', () => { | |
expect(err).toEqual('test') | ||
} | ||
}) | ||
|
||
it.only('should skip stashing changes if no lint-staged files are changed', async () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Whoops! I've fixed this in my next commit :) |
||
expect.assertions(4) | ||
hasPartiallyStagedFiles.mockImplementationOnce(() => Promise.resolve(true)) | ||
sgfMock.mockImplementationOnce((params, callback) => { | ||
callback(null, [{ filename: 'sample.java', status: 'Modified' }]) | ||
}) | ||
execa.mockImplementationOnce(() => | ||
Promise.resolve({ | ||
stdout: '', | ||
stderr: 'Linter finished with error', | ||
code: 1, | ||
failed: true, | ||
cmd: 'mock cmd' | ||
}) | ||
) | ||
|
||
try { | ||
await runAll(getConfig({ linters: { '*.js': ['echo "sample"'] } })) | ||
} catch (err) { | ||
console.log(err) | ||
} | ||
expect(console.printHistory()).toMatchSnapshot() | ||
expect(gitStashSave).toHaveBeenCalledTimes(0) | ||
expect(updateStash).toHaveBeenCalledTimes(0) | ||
expect(gitStashPop).toHaveBeenCalledTimes(0) | ||
}) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’m not sure I understand how this is working. Mind explaining in code comments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed the logic of this slightly in my next commit but also added a comment as you requested.