Merge branch 'public-deploy-keys' into 'master'

Allow admin to create public deploy keys that are accessible to any project.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774.

Project settings:

![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png)

The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.

The list of projects below the public key has been changed to only show projects the user has access to.

"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.

Admin index:

![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png)

Admin detail page:

![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png)

Projects using the deploy key are listed on the left and can be disabled easily.

See merge request !469

4 files changed, 122 insertions, 3 deletions

diff --git a/features/admin/deploy_keys.feature b/features/admin/deploy_keys.feature
new file mode 100644
index 00000000000..9df47eb51fd
--- /dev/null
+++ b/features/admin/deploy_keys.feature
@@ -0,0 +1,21 @@
+@admin
+Feature: Admin Deploy Keys
+  Background:
+    Given I sign in as an admin
+    And there are public deploy keys in system
+
+  Scenario: Deploy Keys list
+    When I visit admin deploy keys page
+    Then I should see all public deploy keys
+
+  Scenario: Deploy Keys show
+    When I visit admin deploy keys page
+    And I click on first deploy key
+    Then I should see deploy key details
+
+  Scenario: Deploy Keys new
+    When I visit admin deploy keys page
+    And I click 'New Deploy Key'
+    And I submit new deploy key
+    Then I should be on admin deploy keys page
+    And I should see newly created deploy key
diff --git a/features/project/deploy_keys.feature b/features/project/deploy_keys.feature
index 13e3b9bbd2e..a71f6124d9c 100644
--- a/features/project/deploy_keys.feature
+++ b/features/project/deploy_keys.feature
@@ -6,7 +6,17 @@ Feature: Project Deploy Keys
   Scenario: I should see deploy keys list
     Given project has deploy key
     When I visit project deploy keys page
-    Then I should see project deploy keys
+    Then I should see project deploy key
+
+  Scenario: I should see project deploy keys
+    Given other project has deploy key
+    When I visit project deploy keys page
+    Then I should see other project deploy key 
+
+  Scenario: I should see public deploy keys
+    Given public deploy key exists
+    When I visit project deploy keys page
+    Then I should see public deploy key
 
   Scenario: I add new deploy key
     Given I visit project deploy keys page
@@ -15,9 +25,16 @@ Feature: Project Deploy Keys
     Then I should be on deploy keys page
     And I should see newly created deploy key
 
-  Scenario: I attach deploy key to project
+  Scenario: I attach other project deploy key to project
     Given other project has deploy key
     And I visit project deploy keys page
     When I click attach deploy key
     Then I should be on deploy keys page
     And I should see newly created deploy key
+
+  Scenario: I attach public deploy key to project
+    Given public deploy key exists
+    And I visit project deploy keys page
+    When I click attach deploy key
+    Then I should be on deploy keys page
+    And I should see newly created deploy key
diff --git a/features/steps/admin/deploy_keys.rb b/features/steps/admin/deploy_keys.rb
new file mode 100644
index 00000000000..fb0b611762e
--- /dev/null
+++ b/features/steps/admin/deploy_keys.rb
@@ -0,0 +1,57 @@
+class Spinach::Features::AdminDeployKeys < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedAdmin
+
+  step 'there are public deploy keys in system' do
+    create(:deploy_key, public: true)
+    create(:another_deploy_key, public: true)
+  end
+
+  step 'I should see all public deploy keys' do
+    DeployKey.are_public.each do |p|
+      page.should have_content p.title
+    end
+  end
+
+  step 'I click on first deploy key' do
+    click_link DeployKey.are_public.first.title
+  end
+
+  step 'I should see deploy key details' do
+    deploy_key = DeployKey.are_public.first
+    current_path.should == admin_deploy_key_path(deploy_key)
+    page.should have_content(deploy_key.title)
+    page.should have_content(deploy_key.key)
+  end
+
+  step 'I visit admin deploy key page' do
+    visit admin_deploy_key_path(deploy_key)
+  end
+
+  step 'I visit admin deploy keys page' do
+    visit admin_deploy_keys_path
+  end
+
+  step 'I click \'New Deploy Key\'' do
+    click_link 'New Deploy Key'
+  end
+
+  step 'I submit new deploy key' do
+    fill_in "deploy_key_title", with: "laptop"
+    fill_in "deploy_key_key", with: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop"
+    click_button "Create"
+  end
+
+  step 'I should be on admin deploy keys page' do
+    current_path.should == admin_deploy_keys_path
+  end
+
+  step 'I should see newly created deploy key' do
+    page.should have_content(deploy_key.title)
+  end
+
+  def deploy_key
+    @deploy_key ||= DeployKey.are_public.first
+  end
+end
diff --git a/features/steps/project/deploy_keys.rb b/features/steps/project/deploy_keys.rb
index 4bf5cb5fa40..50e14513a7a 100644
--- a/features/steps/project/deploy_keys.rb
+++ b/features/steps/project/deploy_keys.rb
@@ -7,12 +7,24 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
     create(:deploy_keys_project, project: @project)
   end
 
-  step 'I should see project deploy keys' do
+  step 'I should see project deploy key' do
     within '.enabled-keys' do
       page.should have_content deploy_key.title
     end
   end
 
+  step 'I should see other project deploy key' do
+    within '.available-keys' do
+      page.should have_content other_deploy_key.title
+    end
+  end
+
+  step 'I should see public deploy key' do
+    within '.available-keys' do
+      page.should have_content public_deploy_key.title
+    end
+  end
+
   step 'I click \'New Deploy Key\'' do
     click_link 'New Deploy Key'
   end
@@ -39,6 +51,10 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
     create(:deploy_keys_project, project: @second_project)
   end
 
+  step 'public deploy key exists' do
+    create(:deploy_key, public: true)
+  end
+
   step 'I click attach deploy key' do
     within '.available-keys' do
       click_link 'Enable'
@@ -50,4 +66,12 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
   def deploy_key
     @project.deploy_keys.last
   end
+
+  def other_deploy_key
+    @second_project.deploy_keys.last
+  end
+
+  def public_deploy_key
+    DeployKey.are_public.last
+  end
 end