Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master'

Generate and handle a gl_repository param to pass around components

Closes #29925

See merge request !10992

1 files changed, 32 insertions, 11 deletions

diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 5ab3c4a0e34..0260416dbe2 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -5,6 +5,7 @@ describe PostReceive do
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
   let(:project) { create(:project, :repository) }
+  let(:project_identifier) { "project-#{project.id}" }
   let(:key) { create(:key, user: project.owner) }
   let(:key_id) { key.shell_id }
 
@@ -14,6 +15,26 @@ describe PostReceive do
     end
   end
 
+  context 'with a non-existing project' do
+    let(:project_identifier) { "project-123456789" }
+    let(:error_message) do
+      "Triggered hook for non-existing project with identifier \"#{project_identifier}\""
+    end
+
+    it "returns false and logs an error" do
+      expect(Gitlab::GitLogger).to receive(:error).with("POST-RECEIVE: #{error_message}")
+      expect(described_class.new.perform(project_identifier, key_id, base64_changes)).to be(false)
+    end
+  end
+
+  context "with an absolute path as the project identifier" do
+    it "searches the project by full path" do
+      expect(Project).to receive(:find_by_full_path).with(project.full_path).and_call_original
+
+      described_class.new.perform(pwd(project), key_id, base64_changes)
+    end
+  end
+
   describe "#process_project_changes" do
     before do
       allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
@@ -25,7 +46,7 @@ describe PostReceive do
       it "calls GitTagPushService" do
         expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
         expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
@@ -35,7 +56,7 @@ describe PostReceive do
       it "calls GitTagPushService" do
         expect_any_instance_of(GitPushService).not_to receive(:execute)
         expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
@@ -45,12 +66,12 @@ describe PostReceive do
       it "does not call any of the services" do
         expect_any_instance_of(GitPushService).not_to receive(:execute)
         expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
     context "gitlab-ci.yml" do
-      subject { described_class.new.perform(pwd(project), key_id, base64_changes) }
+      subject { described_class.new.perform(project_identifier, key_id, base64_changes) }
 
       context "creates a Ci::Pipeline for every change" do
         before do
@@ -74,8 +95,8 @@ describe PostReceive do
 
   context "webhook" do
     it "fetches the correct project" do
-      expect(Project).to receive(:find_by_full_path).with(project.path_with_namespace).and_return(project)
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      expect(Project).to receive(:find_by).with(id: project.id.to_s)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
 
     it "does not run if the author is not in the project" do
@@ -85,22 +106,22 @@ describe PostReceive do
 
       expect(project).not_to receive(:execute_hooks)
 
-      expect(described_class.new.perform(pwd(project), key_id, base64_changes)).to be_falsey
+      expect(described_class.new.perform(project_identifier, key_id, base64_changes)).to be_falsey
     end
 
     it "asks the project to trigger all hooks" do
-      allow(Project).to receive(:find_by_full_path).and_return(project)
+      allow(Project).to receive(:find_by).and_return(project)
       expect(project).to receive(:execute_hooks).twice
       expect(project).to receive(:execute_services).twice
 
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
 
     it "enqueues a UpdateMergeRequestsWorker job" do
-      allow(Project).to receive(:find_by_full_path).and_return(project)
+      allow(Project).to receive(:find_by).and_return(project)
       expect(UpdateMergeRequestsWorker).to receive(:perform_async).with(project.id, project.owner.id, any_args)
 
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
   end