diff options
Diffstat (limited to 'spec/finders')
-rw-r--r-- | spec/finders/keys_finder_spec.rb | 153 | ||||
-rw-r--r-- | spec/finders/merge_request_target_project_finder_spec.rb | 16 | ||||
-rw-r--r-- | spec/finders/personal_access_tokens_finder_spec.rb | 10 |
3 files changed, 138 insertions, 41 deletions
diff --git a/spec/finders/keys_finder_spec.rb b/spec/finders/keys_finder_spec.rb index 147e6ee3d84..f80abdcdb38 100644 --- a/spec/finders/keys_finder_spec.rb +++ b/spec/finders/keys_finder_spec.rb @@ -3,74 +3,145 @@ require 'spec_helper' describe KeysFinder do - subject(:keys_finder) { described_class.new(user, params) } + subject { described_class.new(user, params).execute } let(:user) { create(:user) } - let(:fingerprint_type) { 'md5' } - let(:fingerprint) { 'ba:81:59:68:d7:6c:cd:02:02:bf:6a:9b:55:4e:af:d1' } - - let(:params) do - { - type: fingerprint_type, - fingerprint: fingerprint - } - end + let(:params) { {} } - let!(:key) do - create(:key, user: user, + let!(:key_1) do + create(:personal_key, + last_used_at: 7.days.ago, + user: user, key: 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt1016k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=', fingerprint: 'ba:81:59:68:d7:6c:cd:02:02:bf:6a:9b:55:4e:af:d1', - fingerprint_sha256: 'nUhzNyftwADy8AH3wFY31tAKs7HufskYTte2aXo/lCg' - ) + fingerprint_sha256: 'nUhzNyftwADy8AH3wFY31tAKs7HufskYTte2aXo/lCg') end + let!(:key_2) { create(:personal_key, last_used_at: nil, user: user) } + let!(:key_3) { create(:personal_key, last_used_at: 2.days.ago) } + context 'with a regular user' do it 'raises GitLabAccessDeniedError' do - expect do - keys_finder.execute - end.to raise_error(KeysFinder::GitLabAccessDeniedError) + expect { subject }.to raise_error(KeysFinder::GitLabAccessDeniedError) end end context 'with an admin user' do let(:user) {create(:admin)} - context 'with invalid MD5 fingerprint' do - let(:fingerprint) { '11:11:11:11' } + context 'key_type' do + let!(:deploy_key) { create(:deploy_key) } - it 'raises InvalidFingerprint' do - expect { keys_finder.execute } - .to raise_error(KeysFinder::InvalidFingerprint) - end - end + context 'when `key_type` is `ssh`' do + before do + params[:key_type] = 'ssh' + end - context 'with invalid SHA fingerprint' do - let(:fingerprint_type) { 'sha256' } - let(:fingerprint) { 'nUhzNyftwAAKs7HufskYTte2g' } + it 'returns only SSH keys' do + expect(subject).to contain_exactly(key_1, key_2, key_3) + end + end - it 'raises InvalidFingerprint' do - expect { keys_finder.execute } - .to raise_error(KeysFinder::InvalidFingerprint) + context 'when `key_type` is not specified' do + it 'returns all types of keys' do + expect(subject).to contain_exactly(key_1, key_2, key_3, deploy_key) + end end end - context 'with valid MD5 params' do - it 'returns key if the fingerprint is found' do - result = keys_finder.execute + context 'fingerprint' do + context 'with invalid fingerprint' do + context 'with invalid MD5 fingerprint' do + before do + params[:fingerprint] = '11:11:11:11' + end + + it 'raises InvalidFingerprint' do + expect { subject }.to raise_error(KeysFinder::InvalidFingerprint) + end + end + + context 'with invalid SHA fingerprint' do + before do + params[:fingerprint] = 'nUhzNyftwAAKs7HufskYTte2g' + end + + it 'raises InvalidFingerprint' do + expect { subject }.to raise_error(KeysFinder::InvalidFingerprint) + end + end + end - expect(result).to eq(key) - expect(key.user).to eq(user) + context 'with valid fingerprints' do + context 'with valid MD5 params' do + context 'with an existent fingerprint' do + before do + params[:fingerprint] = 'ba:81:59:68:d7:6c:cd:02:02:bf:6a:9b:55:4e:af:d1' + end + + it 'returns the key' do + expect(subject).to eq(key_1) + expect(subject.user).to eq(user) + end + end + + context 'with a non-existent fingerprint' do + before do + params[:fingerprint] = 'bb:81:59:68:d7:6c:cd:02:02:bf:6a:9b:55:4e:af:d2' + end + + it 'returns nil' do + expect(subject).to be_nil + end + end + end + + context 'with valid SHA256 params' do + context 'with an existent fingerprint' do + before do + params[:fingerprint] = 'SHA256:nUhzNyftwADy8AH3wFY31tAKs7HufskYTte2aXo/lCg' + end + + it 'returns key' do + expect(subject).to eq(key_1) + expect(subject.user).to eq(user) + end + end + + context 'with a non-existent fingerprint' do + before do + params[:fingerprint] = 'SHA256:xTjuFqftwADy8AH3wFY31tAKs7HufskYTte2aXi/mNp' + end + + it 'returns nil' do + expect(subject).to be_nil + end + end + end end end - context 'with valid SHA256 params' do - let(:fingerprint) { 'ba:81:59:68:d7:6c:cd:02:02:bf:6a:9b:55:4e:af:d1' } + context 'user' do + context 'without user' do + it 'contains ssh_keys of all users in the system' do + expect(subject).to contain_exactly(key_1, key_2, key_3) + end + end + + context 'with user' do + before do + params[:user] = user + end - it 'returns key if the fingerprint is found' do - result = keys_finder.execute + it 'contains ssh_keys of only the specified users' do + expect(subject).to contain_exactly(key_1, key_2) + end + end + end - expect(result).to eq(key) - expect(key.user).to eq(user) + context 'sort order' do + it 'sorts in last_used_at_desc order' do + expect(subject).to eq([key_3, key_1, key_2]) end end end diff --git a/spec/finders/merge_request_target_project_finder_spec.rb b/spec/finders/merge_request_target_project_finder_spec.rb index 1d78b7ba4e3..7fef16d1040 100644 --- a/spec/finders/merge_request_target_project_finder_spec.rb +++ b/spec/finders/merge_request_target_project_finder_spec.rb @@ -27,6 +27,22 @@ describe MergeRequestTargetProjectFinder do expect(finder.execute).to contain_exactly(other_fork, forked_project) end + + it 'does not include routes by default' do + row = finder.execute.first + + expect(row.association(:route).loaded?).to be_falsey + expect(row.association(:namespace).loaded?).to be_falsey + expect(row.namespace.association(:route).loaded?).to be_falsey + end + + it 'includes routes when requested' do + row = finder.execute(include_routes: true).first + + expect(row.association(:route).loaded?).to be_truthy + expect(row.association(:namespace).loaded?).to be_truthy + expect(row.namespace.association(:route).loaded?).to be_truthy + end end context 'public projects' do diff --git a/spec/finders/personal_access_tokens_finder_spec.rb b/spec/finders/personal_access_tokens_finder_spec.rb index a44daf585ba..ce8ef80bb99 100644 --- a/spec/finders/personal_access_tokens_finder_spec.rb +++ b/spec/finders/personal_access_tokens_finder_spec.rb @@ -26,6 +26,16 @@ describe PersonalAccessTokensFinder do revoked_impersonation_token, expired_impersonation_token) end + describe 'with sort order' do + before do + params[:sort] = 'id_asc' + end + + it 'sorts records as per the specified sort order' do + expect(subject).to match_array(PersonalAccessToken.all.order(id: :asc)) + end + end + describe 'without impersonation' do before do params[:impersonation] = false |