diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
commit | bd2822ce1f67c5e50ead272962840638fe37a1f7 (patch) | |
tree | 2b38d2d4943b1b70eb0bce66dc40a562accfc363 /spec/features/tags | |
parent | b452b0c7056e481778bfc5838d47dca813bf12ed (diff) | |
parent | a7976905d17c22b0f2caeb54fa7f468568412cd1 (diff) |
Merge remote-tracking branch 'origin/master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/tags')
-rw-r--r-- | spec/features/tags/master_deletes_tag_spec.rb | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb index d6a6b8fc7d5..80750c904b5 100644 --- a/spec/features/tags/master_deletes_tag_spec.rb +++ b/spec/features/tags/master_deletes_tag_spec.rb @@ -35,15 +35,30 @@ feature 'Master deletes tag' do end context 'when pre-receive hook fails', js: true do - before do - allow_any_instance_of(Gitlab::Git::HooksService).to receive(:execute) - .and_raise(Gitlab::Git::HooksService::PreReceiveError, 'Do not delete tags') + context 'when Gitaly operation_user_delete_tag feature is enabled' do + before do + allow_any_instance_of(Gitlab::GitalyClient::OperationService).to receive(:rm_tag) + .and_raise(Gitlab::Git::HooksService::PreReceiveError, 'Do not delete tags') + end + + scenario 'shows the error message' do + delete_first_tag + + expect(page).to have_content('Do not delete tags') + end end - scenario 'shows the error message' do - delete_first_tag + context 'when Gitaly operation_user_delete_tag feature is disabled', skip_gitaly_mock: true do + before do + allow_any_instance_of(Gitlab::Git::HooksService).to receive(:execute) + .and_raise(Gitlab::Git::HooksService::PreReceiveError, 'Do not delete tags') + end + + scenario 'shows the error message' do + delete_first_tag - expect(page).to have_content('Do not delete tags') + expect(page).to have_content('Do not delete tags') + end end end |