Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1d4418bc
Commit
1d4418bc
authored
Mar 01, 2016
by
Phil Hughes
Committed by
Robert Speicher
Mar 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing ssh key tests
parent
1efe1054
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/profiles/keys_controller.rb
app/controllers/profiles/keys_controller.rb
+1
-1
features/profile/ssh_keys.feature
features/profile/ssh_keys.feature
+1
-1
features/steps/profile/ssh_keys.rb
features/steps/profile/ssh_keys.rb
+2
-2
No files found.
app/controllers/profiles/keys_controller.rb
View file @
1d4418bc
...
@@ -20,7 +20,7 @@ class Profiles::KeysController < Profiles::ApplicationController
...
@@ -20,7 +20,7 @@ class Profiles::KeysController < Profiles::ApplicationController
if
@key
.
save
if
@key
.
save
redirect_to
profile_key_path
(
@key
)
redirect_to
profile_key_path
(
@key
)
else
else
redirect_to
profile_keys_path
,
flash:
{
key:
@key
}
redirect_to
profile_keys_path
,
flash:
{
key:
@key
}
end
end
end
end
...
...
features/profile/ssh_keys.feature
View file @
1d4418bc
...
@@ -9,7 +9,7 @@ Feature: Profile SSH Keys
...
@@ -9,7 +9,7 @@ Feature: Profile SSH Keys
Then
I should see my ssh keys
Then
I should see my ssh keys
Scenario
:
Add new ssh key
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"
And
I submit new ssh key
"Laptop"
Then
I should see new ssh key
"Laptop"
Then
I should see new ssh key
"Laptop"
...
...
features/steps/profile/ssh_keys.rb
View file @
1d4418bc
...
@@ -7,8 +7,8 @@ class Spinach::Features::ProfileSshKeys < Spinach::FeatureSteps
...
@@ -7,8 +7,8 @@ class Spinach::Features::ProfileSshKeys < Spinach::FeatureSteps
end
end
end
end
step
'I
click link "Add new"
'
do
step
'I
should see new ssh key form
'
do
click_link
"Add SSH Key"
expect
(
page
).
to
have_content
(
"Add an SSH key"
)
end
end
step
'I submit new ssh key "Laptop"'
do
step
'I submit new ssh key "Laptop"'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment