Commit 5f9cdbab1d8373f3455c1cd8136db6479a54adf7
1 parent
cfcf24dc
Exists in
master
and in
4 other branches
Modify test to pass new project hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
4 additions
and
2 deletions
Show diff stats
app/observers/merge_request_observer.rb
| @@ -64,6 +64,8 @@ class MergeRequestObserver < ActivityObserver | @@ -64,6 +64,8 @@ class MergeRequestObserver < ActivityObserver | ||
| 64 | end | 64 | end |
| 65 | 65 | ||
| 66 | def execute_hooks(merge_request) | 66 | def execute_hooks(merge_request) |
| 67 | - merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) | 67 | + if merge_request.project |
| 68 | + merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) | ||
| 69 | + end | ||
| 68 | end | 70 | end |
| 69 | end | 71 | end |
spec/observers/merge_request_observer_spec.rb
| @@ -4,7 +4,7 @@ describe MergeRequestObserver do | @@ -4,7 +4,7 @@ describe MergeRequestObserver do | ||
| 4 | let(:some_user) { create :user } | 4 | let(:some_user) { create :user } |
| 5 | let(:assignee) { create :user } | 5 | let(:assignee) { create :user } |
| 6 | let(:author) { create :user } | 6 | let(:author) { create :user } |
| 7 | - let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author) } | 7 | + let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author).as_null_object } |
| 8 | let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author, target_project: create(:project)) } | 8 | let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author, target_project: create(:project)) } |
| 9 | let(:unassigned_mr) { create(:merge_request, author: author, target_project: create(:project)) } | 9 | let(:unassigned_mr) { create(:merge_request, author: author, target_project: create(:project)) } |
| 10 | let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author, target_project: create(:project)) } | 10 | let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author, target_project: create(:project)) } |