Skip to content
Snippets Groups Projects
Commit 5f9cdbab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Modify test to pass new project hooks

parent cfcf24dc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -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)) }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment