diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 21:06:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 21:06:33 +0300 |
commit | 581c10e344d85729e77fce78513819d159289dc5 (patch) | |
tree | ea84e89fddcafe5a8abdc8a9a5f7f210b6644e77 /spec/models/repository_spec.rb | |
parent | 68d3f33d5194c446812d09f079749ddf56f95378 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 9cb3229aeb1..bad05990965 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1530,7 +1530,7 @@ describe Repository do expect(merge_request.reload.rebase_commit_sha).to eq(new_sha) end - it 'does rollback when an error is encountered in the second step' do + it 'does rollback when a PreReceiveError is encountered in the second step' do second_response = double(pre_receive_error: 'my_error', git_error: nil) mock_gitaly(second_response) @@ -1541,6 +1541,17 @@ describe Repository do expect(merge_request.reload.rebase_commit_sha).to be_nil end + it 'does rollback when a GitError is encountered in the second step' do + second_response = double(pre_receive_error: nil, git_error: 'git error') + mock_gitaly(second_response) + + expect do + repository.rebase(user, merge_request) + end.to raise_error(Gitlab::Git::Repository::GitError) + + expect(merge_request.reload.rebase_commit_sha).to be_nil + end + def mock_gitaly(second_response) responses = [ double(rebase_sha: new_sha).as_null_object, |