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

Fix worker specs to parse namespaces

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-09 10:34:46 +02:00
parent 80e984ee5e
commit 8a08fdcd32
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/workers/post_receive.rb
View file

@ -2,8 +2,9 @@ class PostReceive
@queue = :post_receive @queue = :post_receive
def self.perform(repo_path, oldrev, newrev, ref, identifier) def self.perform(repo_path, oldrev, newrev, ref, identifier)
repo_path = repo_path.gsub(Gitlab.config.git_base_path, "") repo_path.gsub!(Gitlab.config.git_base_path.to_s, "")
repo_path = repo_path.gsub(/.git$/, "") repo_path.gsub!(/.git$/, "")
repo_path.gsub!(/^\//, "")
project = Project.find_with_namespace(repo_path) project = Project.find_with_namespace(repo_path)
return false if project.nil? return false if project.nil?

12
spec/workers/post_receive_spec.rb
View file

@ -14,8 +14,8 @@ describe PostReceive do
let(:key_id) { key.identifier } let(:key_id) { key.identifier }
it "fetches the correct project" do it "fetches the correct project" do
Project.should_receive(:find_by_path).with(project.path).and_return(project) Project.should_receive(:find_by_path).with(project.path_with_namespace).and_return(project)
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id) PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
end end
it "does not run if the author is not in the project" do it "does not run if the author is not in the project" do
@ -24,7 +24,7 @@ describe PostReceive do
project.should_not_receive(:observe_push) project.should_not_receive(:observe_push)
project.should_not_receive(:execute_hooks) project.should_not_receive(:execute_hooks)
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
end end
it "asks the project to trigger all hooks" do it "asks the project to trigger all hooks" do
@ -34,7 +34,11 @@ describe PostReceive do
project.should_receive(:update_merge_requests) project.should_receive(:update_merge_requests)
project.should_receive(:observe_push) project.should_receive(:observe_push)
PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id) PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
end end
end end
def pwd(project)
File.join(Gitlab.config.git_base_path, project.path_with_namespace)
end
end end