deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Post Receive Refactored. Service hooks also triggered now

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-19 21:44:05 +03:00
parent 95c23b2f97
commit 8500743464
3 changed files with 89 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/models/project_hooks_spec.rb
View file

@ -11,13 +11,15 @@ describe Project, "Hooks" do
describe "Post Receive Event" do
it "should create push event" do
oldrev, newrev, ref = '00000000000000000000000000000000', 'newrev', 'refs/heads/master'
project.observe_push(oldrev, newrev, ref, @user)
data = project.post_receive_data(oldrev, newrev, ref, @user)
project.observe_push(data)
event = Event.last
event.should_not be_nil
event.project.should == project
event.action.should == Event::Pushed
event.data == project.post_receive_data(oldrev, newrev, ref, @user)
event.data.should == data
end
end
@ -25,7 +27,7 @@ describe Project, "Hooks" do
context "with no web hooks" do
it "raises no errors" do
lambda {
project.execute_hooks('oldrev', 'newrev', 'ref', @user)
project.execute_hooks({})
}.should_not raise_error
end
end
@ -41,7 +43,7 @@ describe Project, "Hooks" do
@project_hook.should_receive(:execute).once
@project_hook_2.should_receive(:execute).once
project.execute_hooks('oldrev', 'newrev', 'refs/heads/master', @user)
project.trigger_post_receive('oldrev', 'newrev', 'refs/heads/master', @user)
end
end
@ -53,12 +55,12 @@ describe Project, "Hooks" do
it "when pushing a branch for the first time" do
@project_hook.should_not_receive(:execute)
project.execute_hooks('00000000000000000000000000000000', 'newrev', 'refs/heads/master', @user)
project.trigger_post_receive('00000000000000000000000000000000', 'newrev', 'refs/heads/master', @user)
end
it "when pushing tags" do
@project_hook.should_not_receive(:execute)
project.execute_hooks('oldrev', 'newrev', 'refs/tags/v1.0.0', @user)
project.trigger_post_receive('oldrev', 'newrev', 'refs/tags/v1.0.0', @user)
end
end

14
spec/workers/post_receive_spec.rb
View file

@ -27,16 +27,12 @@ describe PostReceive do
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
end
it "asks the project to execute web hooks" do
it "asks the project to trigger all hooks" do
Project.stub(find_by_path: project)
project.should_receive(:execute_hooks).with('sha-old', 'sha-new', 'refs/heads/master', project.owner)
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id)
end
it "asks the project to observe push/create event data" do
Project.stub(find_by_path: project)
project.should_receive(:observe_push).with('sha-old', 'sha-new', 'refs/heads/master', project.owner)
project.should_receive(:execute_hooks)
project.should_receive(:execute_services)
project.should_receive(:update_merge_requests)
project.should_receive(:observe_push)
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id)
end