diff options
| -rw-r--r-- | lib/gitlab_keys.rb | 3 | ||||
| -rw-r--r-- | spec/gitlab_keys_spec.rb | 27 |
2 files changed, 26 insertions, 4 deletions
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb index bc00867..0098578 100644 --- a/lib/gitlab_keys.rb +++ b/lib/gitlab_keys.rb @@ -31,6 +31,7 @@ class GitlabKeys $logger.info "Adding key #{@key_id} => #{@key.inspect}" auth_line = "command=\"#{ROOT_PATH}/bin/gitlab-shell #{@key_id}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #{@key}" open(auth_file, 'a') { |file| file.puts(auth_line) } + true end def rm_key @@ -44,9 +45,11 @@ class GitlabKeys temp.close FileUtils.cp(temp.path, auth_file) end + true end def clear open(auth_file, 'w') { |file| file.puts '# Managed by gitlab-shell' } + true end end diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb index a0bf678..20768e2 100644 --- a/spec/gitlab_keys_spec.rb +++ b/spec/gitlab_keys_spec.rb @@ -25,10 +25,17 @@ describe GitlabKeys do File.read(tmp_authorized_keys_path).should == "existing content\n#{auth_line}\n" end - it "should log an add-key event" do - $logger.should_receive(:info).with('Adding key key-741 => "ssh-rsa AAAAB3NzaDAxx2E"') - gitlab_keys.stub(:open) - gitlab_keys.send :add_key + context "without file writing" do + before { gitlab_keys.stub(:open) } + + it "should log an add-key event" do + $logger.should_receive(:info).with('Adding key key-741 => "ssh-rsa AAAAB3NzaDAxx2E"') + gitlab_keys.send :add_key + end + + it "should return true" do + gitlab_keys.send(:add_key).should be_true + end end end @@ -50,6 +57,18 @@ describe GitlabKeys do $logger.should_receive(:info).with('Removing key key-741') gitlab_keys.send :rm_key end + + it "should return true" do + gitlab_keys.send(:rm_key).should be_true + end + end + + describe :clear do + let(:gitlab_keys) { build_gitlab_keys('clear') } + + it "should return true" do + gitlab_keys.send(:clear).should be_true + end end describe :exec do |