From 8a08fdcd32ec58bc538ce5b6fc9df3fbe61d05e1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 10:34:46 +0200 Subject: [PATCH] Fix worker specs to parse namespaces --- app/workers/post_receive.rb | 5 +++-- spec/workers/post_receive_spec.rb | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index bf14ab8d579..11281b8b656 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -2,8 +2,9 @@ class PostReceive @queue = :post_receive def self.perform(repo_path, oldrev, newrev, ref, identifier) - repo_path = repo_path.gsub(Gitlab.config.git_base_path, "") - repo_path = repo_path.gsub(/.git$/, "") + repo_path.gsub!(Gitlab.config.git_base_path.to_s, "") + repo_path.gsub!(/.git$/, "") + repo_path.gsub!(/^\//, "") project = Project.find_with_namespace(repo_path) return false if project.nil? diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index bbc91f4474a..443c8c1a3c4 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -14,8 +14,8 @@ describe PostReceive do let(:key_id) { key.identifier } it "fetches the correct project" do - Project.should_receive(:find_by_path).with(project.path).and_return(project) - PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id) + Project.should_receive(:find_by_path).with(project.path_with_namespace).and_return(project) + PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) end 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(: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 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(: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 + + def pwd(project) + File.join(Gitlab.config.git_base_path, project.path_with_namespace) + end end