From 6fcc65b51330bec6bde577d1bf761f69b6f8605a Mon Sep 17 00:00:00 2001 From: Patrick Bajao Date: Thu, 21 Mar 2019 12:42:28 +0800 Subject: Update Gitlab::AuthorizedKeys specs to be clearer --- spec/lib/gitlab/authorized_keys_spec.rb | 44 ++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'spec/lib/gitlab/authorized_keys_spec.rb') diff --git a/spec/lib/gitlab/authorized_keys_spec.rb b/spec/lib/gitlab/authorized_keys_spec.rb index ffe78967c2a..42bc509eeef 100644 --- a/spec/lib/gitlab/authorized_keys_spec.rb +++ b/spec/lib/gitlab/authorized_keys_spec.rb @@ -7,16 +7,16 @@ describe Gitlab::AuthorizedKeys do subject { described_class.new(logger) } - after do - delete_authorized_keys_file - end - describe '#add_key' do context 'authorized_keys file exists' do before do create_authorized_keys_fixture end + after do + delete_authorized_keys_file + end + it "adds a line at the end of the file and strips trailing garbage" do auth_line = "command=\"#{Gitlab.config.gitlab_shell.path}/bin/gitlab-shell key-741\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa AAAAB3NzaDAxx2E" @@ -28,6 +28,10 @@ describe Gitlab::AuthorizedKeys do end context 'authorized_keys file does not exist' do + before do + delete_authorized_keys_file + end + it 'creates the file' do expect(subject.add_key('key-741', 'ssh-rsa AAAAB3NzaDAxx2E')).to be_truthy expect(File.exist?(tmp_authorized_keys_path)).to be_truthy @@ -48,6 +52,10 @@ describe Gitlab::AuthorizedKeys do create_authorized_keys_fixture end + after do + delete_authorized_keys_file + end + it "adds lines at the end of the file" do auth_line1 = "command=\"#{Gitlab.config.gitlab_shell.path}/bin/gitlab-shell key-12\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-dsa ASDFASGADG" auth_line2 = "command=\"#{Gitlab.config.gitlab_shell.path}/bin/gitlab-shell key-123\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa GFDGDFSGSDFG" @@ -69,6 +77,10 @@ describe Gitlab::AuthorizedKeys do end context 'authorized_keys file does not exist' do + before do + delete_authorized_keys_file + end + it 'creates the file' do expect(subject.batch_add_keys(keys)).to be_truthy expect(File.exist?(tmp_authorized_keys_path)).to be_truthy @@ -82,6 +94,10 @@ describe Gitlab::AuthorizedKeys do create_authorized_keys_fixture end + after do + delete_authorized_keys_file + end + it "removes the right line" do other_line = "command=\"#{Gitlab.config.gitlab_shell.path}/bin/gitlab-shell key-742\",options ssh-rsa AAAAB3NzaDAxx2E" delete_line = "command=\"#{Gitlab.config.gitlab_shell.path}/bin/gitlab-shell key-741\",options ssh-rsa AAAAB3NzaDAxx2E" @@ -98,6 +114,10 @@ describe Gitlab::AuthorizedKeys do end context 'authorized_keys file does not exist' do + before do + delete_authorized_keys_file + end + it 'returns false' do expect(subject.rm_key('key-741')).to be_falsey end @@ -110,12 +130,20 @@ describe Gitlab::AuthorizedKeys do create_authorized_keys_fixture end + after do + delete_authorized_keys_file + end + it "returns true" do expect(subject.clear).to be_truthy end end context 'authorized_keys file does not exist' do + before do + delete_authorized_keys_file + end + it "still returns true" do expect(subject.clear).to be_truthy end @@ -131,12 +159,20 @@ describe Gitlab::AuthorizedKeys do ) end + after do + delete_authorized_keys_file + end + it 'returns array of key IDs' do expect(subject.list_key_ids).to eq([1, 2, 3, 9000]) end end context 'authorized_keys file does not exist' do + before do + delete_authorized_keys_file + end + it 'returns an empty array' do expect(subject.list_key_ids).to be_empty end -- cgit v1.2.1