Add latest changes from gitlab-org/gitlab@master

1 files changed, 112 insertions, 0 deletions

diff --git a/spec/workers/create_commit_signature_worker_spec.rb b/spec/workers/create_commit_signature_worker_spec.rb
new file mode 100644
index 00000000000..d7235fcd907
--- /dev/null
+++ b/spec/workers/create_commit_signature_worker_spec.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CreateCommitSignatureWorker do
+  let(:project) { create(:project, :repository) }
+  let(:commits) { project.repository.commits('HEAD', limit: 3).commits }
+  let(:commit_shas) { commits.map(&:id) }
+  let(:gpg_commit) { instance_double(Gitlab::Gpg::Commit) }
+  let(:x509_commit) { instance_double(Gitlab::X509::Commit) }
+
+  context 'when a signature is found' do
+    before do
+      allow(Project).to receive(:find_by).with(id: project.id).and_return(project)
+      allow(project).to receive(:commits_by).with(oids: commit_shas).and_return(commits)
+    end
+
+    subject { described_class.new.perform(commit_shas, project.id) }
+
+    it 'calls Gitlab::Gpg::Commit#signature' do
+      commits.each do |commit|
+        allow(commit).to receive(:signature_type).and_return(:PGP)
+        expect(Gitlab::Gpg::Commit).to receive(:new).with(commit).and_return(gpg_commit).once
+      end
+
+      expect(gpg_commit).to receive(:signature).exactly(commits.size).times
+
+      subject
+    end
+
+    it 'can recover from exception and continue the signature process' do
+      allow(gpg_commit).to receive(:signature)
+      allow(Gitlab::Gpg::Commit).to receive(:new).and_return(gpg_commit)
+      allow(Gitlab::Gpg::Commit).to receive(:new).with(commits.first).and_raise(StandardError)
+
+      allow(commits[1]).to receive(:signature_type).and_return(:PGP)
+      allow(commits[2]).to receive(:signature_type).and_return(:PGP)
+
+      expect(gpg_commit).to receive(:signature).twice
+
+      subject
+    end
+
+    it 'calls Gitlab::X509::Commit#signature' do
+      commits.each do |commit|
+        allow(commit).to receive(:signature_type).and_return(:X509)
+        expect(Gitlab::X509::Commit).to receive(:new).with(commit).and_return(x509_commit).once
+      end
+
+      expect(x509_commit).to receive(:signature).exactly(commits.size).times
+
+      subject
+    end
+
+    it 'can recover from exception and continue the X509 signature process' do
+      allow(x509_commit).to receive(:signature)
+      allow(Gitlab::X509::Commit).to receive(:new).and_return(x509_commit)
+      allow(Gitlab::X509::Commit).to receive(:new).with(commits.first).and_raise(StandardError)
+
+      allow(commits[1]).to receive(:signature_type).and_return(:X509)
+      allow(commits[2]).to receive(:signature_type).and_return(:X509)
+
+      expect(x509_commit).to receive(:signature).twice
+
+      subject
+    end
+  end
+
+  context 'handles when a string is passed in for the commit SHA' do
+    before do
+      allow(Project).to receive(:find_by).with(id: project.id).and_return(project)
+      allow(project).to receive(:commits_by).with(oids: Array(commit_shas.first)).and_return(commits)
+      allow(commits.first).to receive(:signature_type).and_return(:PGP)
+    end
+
+    it 'creates a signature once' do
+      allow(Gitlab::Gpg::Commit).to receive(:new).with(commits.first).and_return(gpg_commit)
+
+      expect(gpg_commit).to receive(:signature).once
+
+      described_class.new.perform(commit_shas.first, project.id)
+    end
+  end
+
+  context 'when Commit is not found' do
+    let(:nonexisting_commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a34' }
+
+    it 'does not raise errors' do
+      expect { described_class.new.perform([nonexisting_commit_sha], project.id) }.not_to raise_error
+    end
+  end
+
+  context 'when Project is not found' do
+    let(:nonexisting_project_id) { -1 }
+
+    it 'does not raise errors' do
+      expect { described_class.new.perform(commit_shas, nonexisting_project_id) }.not_to raise_error
+    end
+
+    it 'does not call Gitlab::Gpg::Commit#signature' do
+      expect_any_instance_of(Gitlab::Gpg::Commit).not_to receive(:signature)
+
+      described_class.new.perform(commit_shas, nonexisting_project_id)
+    end
+
+    it 'does not call Gitlab::X509::Commit#signature' do
+      expect_any_instance_of(Gitlab::X509::Commit).not_to receive(:signature)
+
+      described_class.new.perform(commit_shas, nonexisting_project_id)
+    end
+  end
+end