diff options
Diffstat (limited to 'spec/models/commit_signatures')
| -rw-r--r-- | spec/models/commit_signatures/gpg_signature_spec.rb | 87 | ||||
| -rw-r--r-- | spec/models/commit_signatures/ssh_signature_spec.rb | 38 | ||||
| -rw-r--r-- | spec/models/commit_signatures/x509_commit_signature_spec.rb | 28 |
3 files changed, 66 insertions, 87 deletions
diff --git a/spec/models/commit_signatures/gpg_signature_spec.rb b/spec/models/commit_signatures/gpg_signature_spec.rb index 9646e974f40..6ae2a202b72 100644 --- a/spec/models/commit_signatures/gpg_signature_spec.rb +++ b/spec/models/commit_signatures/gpg_signature_spec.rb @@ -3,17 +3,26 @@ require 'spec_helper' RSpec.describe CommitSignatures::GpgSignature do + # This commit is seeded from https://gitlab.com/gitlab-org/gitlab-test + # For instructions on how to add more seed data, see the project README let(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' } let!(:project) { create(:project, :repository, path: 'sample-project') } let!(:commit) { create(:commit, project: project, sha: commit_sha) } - let(:gpg_signature) { create(:gpg_signature, commit_sha: commit_sha) } + let(:signature) { create(:gpg_signature, commit_sha: commit_sha) } let(:gpg_key) { create(:gpg_key) } let(:gpg_key_subkey) { create(:gpg_key_subkey) } + let(:attributes) do + { + commit_sha: commit_sha, + project: project, + gpg_key_primary_keyid: gpg_key.keyid + } + end it_behaves_like 'having unique enum values' + it_behaves_like 'commit signature' describe 'associations' do - it { is_expected.to belong_to(:project).required } it { is_expected.to belong_to(:gpg_key) } it { is_expected.to belong_to(:gpg_key_subkey) } end @@ -22,104 +31,56 @@ RSpec.describe CommitSignatures::GpgSignature do subject { described_class.new } it { is_expected.to validate_presence_of(:commit_sha) } - it { is_expected.to validate_presence_of(:project_id) } it { is_expected.to validate_presence_of(:gpg_key_primary_keyid) } end - describe '.safe_create!' do - let(:attributes) do - { - commit_sha: commit_sha, - project: project, - gpg_key_primary_keyid: gpg_key.keyid - } - end - - it 'finds a signature by commit sha if it existed' do - gpg_signature - - expect(described_class.safe_create!(commit_sha: commit_sha)).to eq(gpg_signature) - end - - it 'creates a new signature if it was not found' do - expect { described_class.safe_create!(attributes) }.to change { described_class.count }.by(1) - end - - it 'assigns the correct attributes when creating' do - signature = described_class.safe_create!(attributes) - - expect(signature.project).to eq(project) - expect(signature.commit_sha).to eq(commit_sha) - expect(signature.gpg_key_primary_keyid).to eq(gpg_key.keyid) - end - - it 'does not raise an error in case of a race condition' do - expect(described_class).to receive(:find_by).and_return(nil, double(described_class, persisted?: true)) - - expect(described_class).to receive(:create).and_raise(ActiveRecord::RecordNotUnique) - allow(described_class).to receive(:create).and_call_original - - described_class.safe_create!(attributes) - end - end - describe '.by_commit_sha scope' do let(:gpg_key) { create(:gpg_key, key: GpgHelpers::User2.public_key) } let!(:another_gpg_signature) { create(:gpg_signature, gpg_key: gpg_key) } it 'returns all gpg signatures by sha' do - expect(described_class.by_commit_sha(commit_sha)).to eq([gpg_signature]) + expect(described_class.by_commit_sha(commit_sha)).to match_array([signature]) expect( described_class.by_commit_sha([commit_sha, another_gpg_signature.commit_sha]) - ).to contain_exactly(gpg_signature, another_gpg_signature) - end - end - - describe '#commit' do - it 'fetches the commit through the project' do - expect_next_instance_of(Project) do |instance| - expect(instance).to receive(:commit).with(commit_sha).and_return(commit) - end - - gpg_signature.commit + ).to contain_exactly(signature, another_gpg_signature) end end describe '#gpg_key=' do it 'supports the assignment of a GpgKey' do - gpg_signature = create(:gpg_signature, gpg_key: gpg_key) + signature = create(:gpg_signature, gpg_key: gpg_key) - expect(gpg_signature.gpg_key).to be_an_instance_of(GpgKey) + expect(signature.gpg_key).to be_an_instance_of(GpgKey) end it 'supports the assignment of a GpgKeySubkey' do - gpg_signature = create(:gpg_signature, gpg_key: gpg_key_subkey) + signature = create(:gpg_signature, gpg_key: gpg_key_subkey) - expect(gpg_signature.gpg_key).to be_an_instance_of(GpgKeySubkey) + expect(signature.gpg_key).to be_an_instance_of(GpgKeySubkey) end it 'clears gpg_key and gpg_key_subkey_id when passing nil' do - gpg_signature.update_attribute(:gpg_key, nil) + signature.update_attribute(:gpg_key, nil) - expect(gpg_signature.gpg_key_id).to be_nil - expect(gpg_signature.gpg_key_subkey_id).to be_nil + expect(signature.gpg_key_id).to be_nil + expect(signature.gpg_key_subkey_id).to be_nil end end describe '#gpg_commit' do context 'when commit does not exist' do it 'returns nil' do - allow(gpg_signature).to receive(:commit).and_return(nil) + allow(signature).to receive(:commit).and_return(nil) - expect(gpg_signature.gpg_commit).to be_nil + expect(signature.gpg_commit).to be_nil end end context 'when commit exists' do it 'returns an instance of Gitlab::Gpg::Commit' do - allow(gpg_signature).to receive(:commit).and_return(commit) + allow(signature).to receive(:commit).and_return(commit) - expect(gpg_signature.gpg_commit).to be_an_instance_of(Gitlab::Gpg::Commit) + expect(signature.gpg_commit).to be_an_instance_of(Gitlab::Gpg::Commit) end end end diff --git a/spec/models/commit_signatures/ssh_signature_spec.rb b/spec/models/commit_signatures/ssh_signature_spec.rb new file mode 100644 index 00000000000..ac4496e9d8c --- /dev/null +++ b/spec/models/commit_signatures/ssh_signature_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe CommitSignatures::SshSignature do + # This commit is seeded from https://gitlab.com/gitlab-org/gitlab-test + # For instructions on how to add more seed data, see the project README + let(:commit_sha) { '7b5160f9bb23a3d58a0accdbe89da13b96b1ece9' } + let!(:project) { create(:project, :repository, path: 'sample-project') } + let!(:commit) { create(:commit, project: project, sha: commit_sha) } + let(:signature) { create(:ssh_signature, commit_sha: commit_sha) } + let(:ssh_key) { create(:ed25519_key_256) } + let(:attributes) do + { + commit_sha: commit_sha, + project: project, + key: ssh_key + } + end + + it_behaves_like 'having unique enum values' + it_behaves_like 'commit signature' + + describe 'associations' do + it { is_expected.to belong_to(:key).required } + end + + describe '.by_commit_sha scope' do + let!(:another_signature) { create(:ssh_signature, commit_sha: '0000000000000000000000000000000000000001') } + + it 'returns all signatures by sha' do + expect(described_class.by_commit_sha(commit_sha)).to match_array([signature]) + expect( + described_class.by_commit_sha([commit_sha, another_signature.commit_sha]) + ).to contain_exactly(signature, another_signature) + end + end +end diff --git a/spec/models/commit_signatures/x509_commit_signature_spec.rb b/spec/models/commit_signatures/x509_commit_signature_spec.rb index 076f209e1b7..beb101cdd89 100644 --- a/spec/models/commit_signatures/x509_commit_signature_spec.rb +++ b/spec/models/commit_signatures/x509_commit_signature_spec.rb @@ -3,11 +3,13 @@ require 'spec_helper' RSpec.describe CommitSignatures::X509CommitSignature do + # This commit is seeded from https://gitlab.com/gitlab-org/gitlab-test + # For instructions on how to add more seed data, see the project README let(:commit_sha) { '189a6c924013fc3fe40d6f1ec1dc20214183bc97' } let(:project) { create(:project, :public, :repository) } let!(:commit) { create(:commit, project: project, sha: commit_sha) } let(:x509_certificate) { create(:x509_certificate) } - let(:x509_signature) { create(:x509_commit_signature, commit_sha: commit_sha) } + let(:signature) { create(:x509_commit_signature, commit_sha: commit_sha) } let(:attributes) do { @@ -19,38 +21,16 @@ RSpec.describe CommitSignatures::X509CommitSignature do end it_behaves_like 'having unique enum values' + it_behaves_like 'commit signature' describe 'validation' do - it { is_expected.to validate_presence_of(:commit_sha) } - it { is_expected.to validate_presence_of(:project_id) } it { is_expected.to validate_presence_of(:x509_certificate_id) } end describe 'associations' do - it { is_expected.to belong_to(:project).required } it { is_expected.to belong_to(:x509_certificate).required } end - describe '.safe_create!' do - it 'finds a signature by commit sha if it existed' do - x509_signature - - expect(described_class.safe_create!(commit_sha: commit_sha)).to eq(x509_signature) - end - - it 'creates a new signature if it was not found' do - expect { described_class.safe_create!(attributes) }.to change { described_class.count }.by(1) - end - - it 'assigns the correct attributes when creating' do - signature = described_class.safe_create!(attributes) - - expect(signature.project).to eq(project) - expect(signature.commit_sha).to eq(commit_sha) - expect(signature.x509_certificate_id).to eq(x509_certificate.id) - end - end - describe '#user' do context 'if email is assigned to a user' do let!(:user) { create(:user, email: X509Helpers::User1.certificate_email) } |