Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/controllers/profiles/keys_controller.rb

@@ -41,7 +41,7 @@ def get_keys
       begin
         user = User.find_by_username(params[:username])
         if user.present?
-          render text: user.all_ssh_keys.join('\n')
+          render text: user.all_ssh_keys.join("\n")
         else
           render_404 and return
         end

spec/controllers/profile_keys_controller_spec.rb

+require 'spec_helper'
+
+describe Profiles::KeysController do
+  let(:user)    { create(:user) }
+
+  describe "#get_keys" do
+    describe "non existant user" do
+      it "should generally not work" do
+        get :get_keys, username: 'not-existent'
+
+        expect(response).not_to be_success
+      end
+    end
+
+    describe "user with no keys" do
+      it "should generally work" do
+        get :get_keys, username: user.username
+
+        expect(response).to be_success
+      end
+
+      it "should render all keys separated with a new line" do
+        get :get_keys, username: user.username
+
+        expect(response.body).to eq("")
+      end
+    end
+
+    describe "user with keys" do
+      before do
+        user.keys << create(:key)
+        user.keys << create(:another_key)
+      end
+
+      it "should generally work" do
+        get :get_keys, username: user.username
+
+        expect(response).to be_success
+      end
+
+      it "should render all keys separated with a new line" do
+        get :get_keys, username: user.username
+
+        expect(response.body).not_to eq("")
+        expect(response.body).to eq(user.all_ssh_keys.join("\n"))
+      end
+    end
+  end
+end

spec/factories.rb

@@ -207,6 +207,12 @@
       end
     end
 
+    factory :another_key do
+      key do
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmTillFzNTrrGgwaCKaSj+QCz81E6jBc/s9av0+3b1Hwfxgkqjl4nAK/OD2NjgyrONDTDfR8cRN4eAAy6nY8GLkOyYBDyuc5nTMqs5z3yVuTwf3koGm/YQQCmo91psZ2BgDFTor8SVEE5Mm1D1k3JDMhDFxzzrOtRYFPci9lskTJaBjpqWZ4E9rDTD2q/QZntCqbC3wE9uSemRQB5f8kik7vD/AD8VQXuzKladrZKkzkONCPWsXDspUitjM8HkQdOf0PsYn1CMUC1xKYbCxkg5TkEosIwGv6CoEArUrdu/4+10LVslq494mAvEItywzrluCLCnwELfW+h/m8UHoVhZ"
+      end
+    end
+
     factory :invalid_key do
       key do
         "ssh-rsa this_is_invalid_key=="