summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-01 14:59:51 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-03-03 16:13:55 -0500
commit1d4418bc5feb0f3ac2ac2f1a468e4c5b92f7b518 (patch)
tree0850c3cc67b713b8185d7a96c697c99085cf4ff6
parent1efe1054150177ac5eb31ff85e2c18c5856d480a (diff)
downloadgitlab-ce-1d4418bc5feb0f3ac2ac2f1a468e4c5b92f7b518.tar.gz
Fixed failing ssh key tests
-rw-r--r--app/controllers/profiles/keys_controller.rb2
-rw-r--r--features/profile/ssh_keys.feature2
-rw-r--r--features/steps/profile/ssh_keys.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 6815cb69b68..25430e6be2f 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -20,7 +20,7 @@ class Profiles::KeysController < Profiles::ApplicationController
if @key.save
redirect_to profile_key_path(@key)
else
- redirect_to profile_keys_path, flash: {key: @key}
+ redirect_to profile_keys_path, flash: { key: @key }
end
end
diff --git a/features/profile/ssh_keys.feature b/features/profile/ssh_keys.feature
index 581503fc5f9..b0d5b748916 100644
--- a/features/profile/ssh_keys.feature
+++ b/features/profile/ssh_keys.feature
@@ -9,7 +9,7 @@ Feature: Profile SSH Keys
Then I should see my ssh keys
Scenario: Add new ssh key
- Given I click link "Add new"
+ Given I should see new ssh key form
And I submit new ssh key "Laptop"
Then I should see new ssh key "Laptop"
diff --git a/features/steps/profile/ssh_keys.rb b/features/steps/profile/ssh_keys.rb
index c7f879d247d..a400488a532 100644
--- a/features/steps/profile/ssh_keys.rb
+++ b/features/steps/profile/ssh_keys.rb
@@ -7,8 +7,8 @@ class Spinach::Features::ProfileSshKeys < Spinach::FeatureSteps
end
end
- step 'I click link "Add new"' do
- click_link "Add SSH Key"
+ step 'I should see new ssh key form' do
+ expect(page).to have_content("Add an SSH key")
end
step 'I submit new ssh key "Laptop"' do