Fix post-receive specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
730712f77e
commit
fc65f71747
|
@ -1,7 +1,6 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe PostReceive do
|
||||
|
||||
context "as a resque worker" do
|
||||
it "reponds to #perform" do
|
||||
PostReceive.new.should respond_to(:perform)
|
||||
|
@ -15,7 +14,7 @@ describe PostReceive do
|
|||
|
||||
it "fetches the correct project" do
|
||||
Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
|
||||
PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
|
||||
PostReceive.new.perform(pwd(project), key_id, changes)
|
||||
end
|
||||
|
||||
it "does not run if the author is not in the project" do
|
||||
|
@ -23,7 +22,7 @@ describe PostReceive do
|
|||
|
||||
project.should_not_receive(:execute_hooks)
|
||||
|
||||
PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
|
||||
PostReceive.new.perform(pwd(project), key_id, changes).should be_false
|
||||
end
|
||||
|
||||
it "asks the project to trigger all hooks" do
|
||||
|
@ -32,11 +31,15 @@ describe PostReceive do
|
|||
project.should_receive(:execute_services)
|
||||
project.should_receive(:update_merge_requests)
|
||||
|
||||
PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
|
||||
PostReceive.new.perform(pwd(project), key_id, changes)
|
||||
end
|
||||
end
|
||||
|
||||
def pwd(project)
|
||||
File.join(Gitlab.config.gitlab_shell.repos_path, project.path_with_namespace)
|
||||
end
|
||||
|
||||
def changes
|
||||
'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master'
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue