diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-01 06:50:05 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-01 06:50:05 +0300 |
| commit | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (patch) | |
| tree | ee6aaf013d92766e7184b3e0772e1e5fa99a20e4 /spec/features/tags | |
| parent | f2c60eba25fc001974a61373bc380528416932a2 (diff) | |
| parent | 8713afe61fb1beaff4d550a60b88d274c47006ea (diff) | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/tags')
| -rw-r--r-- | spec/features/tags/master_deletes_tag_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb index 4d6fc13557f..d6a6b8fc7d5 100644 --- a/spec/features/tags/master_deletes_tag_spec.rb +++ b/spec/features/tags/master_deletes_tag_spec.rb @@ -36,8 +36,8 @@ feature 'Master deletes tag' do context 'when pre-receive hook fails', js: true do before do - allow_any_instance_of(GitHooksService).to receive(:execute) - .and_raise(GitHooksService::PreReceiveError, 'Do not delete tags') + 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 |