diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-02-07 13:56:50 +0100 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-02-13 15:38:00 +0100 |
commit | e31b982a13413151dd7317ee15aadcbde0f72edb (patch) | |
tree | 55b7be7cccfefc2e3e9d51bb13359f83df9076c9 /spec/controllers | |
parent | 027a4bd274d7060e35cfe225765c917d7de25b31 (diff) | |
download | gitlab-ce-e31b982a13413151dd7317ee15aadcbde0f72edb.tar.gz |
Make deploy key not show in User's keys list
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/profiles/keys_controller_spec.rb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/spec/controllers/profiles/keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb index 6bcfae0fc13..f7219690722 100644 --- a/spec/controllers/profiles/keys_controller_spec.rb +++ b/spec/controllers/profiles/keys_controller_spec.rb @@ -42,10 +42,9 @@ describe Profiles::KeysController do end describe "user with keys" do - before do - user.keys << create(:key) - user.keys << create(:another_key) - end + let!(:key) { create(:key, user: user) } + let!(:another_key) { create(:another_key, user: user) } + let!(:deploy_key) { create(:deploy_key, user: user) } it "does generally work" do get :get_keys, username: user.username @@ -53,16 +52,16 @@ describe Profiles::KeysController do expect(response).to be_success end - it "renders all keys separated with a new line" do + it "renders all non deploy keys separated with a new line" do get :get_keys, username: user.username - expect(response.body).not_to eq("") + expect(response.body).not_to eq('') expect(response.body).to eq(user.all_ssh_keys.join("\n")) - # Unique part of key 1 - expect(response.body).to match(/PWx6WM4lhHNedGfBpPJNPpZ/) - # Key 2 - expect(response.body).to match(/AQDmTillFzNTrrGgwaCKaSj/) + expect(response.body).to include(key.key.sub(' dummy@gitlab.com', '')) + expect(response.body).to include(another_key.key) + + expect(response.body).not_to include(deploy_key.key) end it "does not render the comment of the key" do |