Skip to content

WIP on issue 669, bypassing stash when it can be bypassed #670

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

Closed
wants to merge 1 commit into from
Closed

WIP on issue 669, bypassing stash when it can be bypassed #670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions spec/overcommit/hook_context/pre_commit_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,23 @@
end
end

context 'when all changes have been staged' do
around do |example|
repo do
echo('Hello World', 'tracked-file')
echo('Hello Other World', 'other-tracked-file')
`git add tracked-file other-tracked-file`
example.run
end
end

it 'does not add a stash' do
subject
"a stash".should == "not have been created"
end

end

context 'when renaming a file during an amendment' do
around do |example|
repo do
Expand Down Expand Up @@ -319,6 +336,23 @@
end
end

context 'when all changes were staged' do
around do |example|
repo do
echo('Bad Stash', 'tracked-file')
echo('Hello Other Bad Stash', 'other-tracked-file')
`git add tracked-file other-tracked-file`
`git stash`
echo('Hello World', 'tracked-file')
echo('Hello Other World', 'other-tracked-file')
`git add tracked-file other-tracked-file`
end
end
it 'should not have applied any stash' do
File.open('tracked-file', 'r').read.should == "Hello World"
end
end

context 'when there were deleted files' do
around do |example|
repo do
Expand Down