diff options
author | Robert Speicher <robert@gitlab.com> | 2018-08-03 04:37:44 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-08-03 04:37:44 +0300 |
commit | f6e6b920bbcbb01bd8a1781f0740b47da9297ee6 (patch) | |
tree | 83411cf99e481187fd1f61444f0bab95be56a58c /spec/workers | |
parent | 7da6ac06449eaf6a5385c3f5c24c5217731aa213 (diff) | |
parent | 3fda119ea35a76bc07accfdacee55cb5b6c880cf (diff) |
Merge branch 'sh-fix-failing-gpg-signature-ce' into 'master'
Make CreateGpgSignatureWorker backwards compatible with original method signature (CE port)
See merge request gitlab-org/gitlab-ce!20998
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/create_gpg_signature_worker_spec.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/spec/workers/create_gpg_signature_worker_spec.rb b/spec/workers/create_gpg_signature_worker_spec.rb index 502765e9786..f5479e57260 100644 --- a/spec/workers/create_gpg_signature_worker_spec.rb +++ b/spec/workers/create_gpg_signature_worker_spec.rb @@ -4,10 +4,9 @@ describe CreateGpgSignatureWorker 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) } context 'when GpgKey is found' do - let(:gpg_commit) { instance_double(Gitlab::Gpg::Commit) } - 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) @@ -36,6 +35,16 @@ describe CreateGpgSignatureWorker do end end + context 'handles when a string is passed in for the commit SHA' do + 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' } |