diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 11:44:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 11:44:03 +0300 |
| commit | f40b99d02ee9411e5a7f9a93e3e6cf33c1d7890e (patch) | |
| tree | a55ff4f3ceaa24fcb008114f62b8ac377db6a129 /spec/models/hooks/web_hook_spec.rb | |
| parent | 9369adb93d119ca349add2b7f80d6a9b4bbd6703 (diff) | |
| parent | 4aa1fdd347d1df4001d9e1298e6dc09c0c478c2e (diff) | |
Merge branch 'master' into rubocop-for-tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
Diffstat (limited to 'spec/models/hooks/web_hook_spec.rb')
| -rw-r--r-- | spec/models/hooks/web_hook_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb index c74432d9739..23f30881d99 100644 --- a/spec/models/hooks/web_hook_spec.rb +++ b/spec/models/hooks/web_hook_spec.rb @@ -71,7 +71,7 @@ describe ProjectHook do it "catches exceptions" do expect(WebHook).to receive(:post).and_raise("Some HTTP Post error") - expect { @project_hook.execute(@data, 'push_hooks') }.to raise_error + expect { @project_hook.execute(@data, 'push_hooks') }.to raise_error(RuntimeError) end end end |