diff options
author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-03 12:12:03 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 12:12:03 +0300 |
commit | 15aadc665f266e8e974aded0fe1e0c7f1a9eb0fb (patch) | |
tree | 7cc2d811dfcb6f42fcfcf1fd6f126280a1e4606f /spec/features/tags | |
parent | 7e84f353b9c7ef79829923bd5888af5acf0aa8b6 (diff) |
Make OperationService RPC's mandatory
Diffstat (limited to 'spec/features/tags')
-rw-r--r-- | spec/features/tags/master_deletes_tag_spec.rb | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb index 9981bfa4609..1d4df2c55a7 100644 --- a/spec/features/tags/master_deletes_tag_spec.rb +++ b/spec/features/tags/master_deletes_tag_spec.rb @@ -35,30 +35,15 @@ feature 'Master deletes tag' do end context 'when pre-receive hook fails', :js do - 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::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 + before do + allow_any_instance_of(Gitlab::GitalyClient::OperationService).to receive(:rm_tag) + .and_raise(Gitlab::Git::PreReceiveError, 'Do not delete tags') end - context 'when Gitaly operation_user_delete_tag feature is disabled', :skip_gitaly_mock do - before do - allow_any_instance_of(Gitlab::Git::HooksService).to receive(:execute) - .and_raise(Gitlab::Git::PreReceiveError, 'Do not delete tags') - end - - scenario 'shows the error message' do - delete_first_tag + scenario 'shows the error message' do + delete_first_tag - expect(page).to have_content('Do not delete tags') - end + expect(page).to have_content('Do not delete tags') end end |