From 5f9cdbab1d8373f3455c1cd8136db6479a54adf7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 3 Dec 2013 12:08:00 +0200 Subject: [PATCH] Modify test to pass new project hooks Signed-off-by: Dmitriy Zaporozhets --- app/observers/merge_request_observer.rb | 4 +++- spec/observers/merge_request_observer_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb index 9e41f8c38..964921981 100644 --- a/app/observers/merge_request_observer.rb +++ b/app/observers/merge_request_observer.rb @@ -64,6 +64,8 @@ class MergeRequestObserver < ActivityObserver end def execute_hooks(merge_request) - merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) + if merge_request.project + merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) + end end end diff --git a/spec/observers/merge_request_observer_spec.rb b/spec/observers/merge_request_observer_spec.rb index 3f5250a00..3e5cdfaf5 100644 --- a/spec/observers/merge_request_observer_spec.rb +++ b/spec/observers/merge_request_observer_spec.rb @@ -4,7 +4,7 @@ describe MergeRequestObserver do let(:some_user) { create :user } let(:assignee) { create :user } let(:author) { create :user } - let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author) } + let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author).as_null_object } let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author, target_project: create(:project)) } let(:unassigned_mr) { create(:merge_request, author: author, target_project: create(:project)) } let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author, target_project: create(:project)) } -- 2.11.0