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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
54493b9a
Commit
54493b9a
authored
Apr 25, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated tests for deploy keys
parent
75618553
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
14 deletions
+11
-14
app/views/projects/deploy_keys/index.html.haml
app/views/projects/deploy_keys/index.html.haml
+4
-6
features/project/deploy_keys.feature
features/project/deploy_keys.feature
+0
-1
features/steps/project/deploy_keys.rb
features/steps/project/deploy_keys.rb
+7
-7
No files found.
app/views/projects/deploy_keys/index.html.haml
View file @
54493b9a
...
...
@@ -12,7 +12,7 @@
=
render
"form"
.col-lg-9.col-lg-offset-3
%hr
.col-lg-9.col-lg-offset-3.append-bottom-default
.col-lg-9.col-lg-offset-3.append-bottom-default
.deploy-keys
%h5
.prepend-top-0
Enabled deploy keys for this project (
#{
@enabled_keys
.
size
}
)
-
if
@enabled_keys
.
any?
...
...
@@ -21,8 +21,7 @@
-
else
.profile-settings-message.text-center
No deploy keys found. Create one with the form above or add existing one below.
.col-lg-9.col-lg-offset-3.append-bottom-default
%h5
.prepend-top-0
%h5
.prepend-top-default
Deploy keys from projects you have access to (
#{
@available_project_keys
.
size
}
)
-
if
@available_project_keys
.
any?
%ul
.well-list
...
...
@@ -30,9 +29,8 @@
-
else
.profile-settings-message.text-center
No deploy keys from your projects could be found. Create one with the form above or add existing one below.
-
if
@available_public_keys
.
any?
.col-lg-9.col-lg-offset-3.append-bottom-default
%h5
.prepend-top-0
-
if
@available_public_keys
.
any?
%h5
.prepend-top-default
Public deploy keys available to any project (
#{
@available_public_keys
.
size
}
)
%ul
.well-list
=
render
@available_public_keys
features/project/deploy_keys.feature
View file @
54493b9a
...
...
@@ -21,7 +21,6 @@ Feature: Project Deploy Keys
Scenario
:
I
add new deploy key
Given
I visit project deploy keys page
When
I click 'New Deploy Key'
And
I submit new deploy key
Then
I should be on deploy keys page
And
I should see newly created deploy key
...
...
features/steps/project/deploy_keys.rb
View file @
54493b9a
...
...
@@ -8,19 +8,19 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
end
step
'I should see project deploy key'
do
page
.
within
'.
enabled
-keys'
do
page
.
within
'.
deploy
-keys'
do
expect
(
page
).
to
have_content
deploy_key
.
title
end
end
step
'I should see other project deploy key'
do
page
.
within
'.
available
-keys'
do
page
.
within
'.
deploy
-keys'
do
expect
(
page
).
to
have_content
other_deploy_key
.
title
end
end
step
'I should see public deploy key'
do
page
.
within
'.
available
-keys'
do
page
.
within
'.
deploy
-keys'
do
expect
(
page
).
to
have_content
public_deploy_key
.
title
end
end
...
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
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
"
click_button
"
Add key
"
end
step
'I should be on deploy keys page'
do
...
...
@@ -40,7 +40,7 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
end
step
'I should see newly created deploy key'
do
page
.
within
'.
enabled
-keys'
do
page
.
within
'.
deploy
-keys'
do
expect
(
page
).
to
have_content
(
deploy_key
.
title
)
end
end
...
...
@@ -56,7 +56,7 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
end
step
'I should only see the same deploy key once'
do
page
.
within
'.
available
-keys'
do
page
.
within
'.
deploy
-keys'
do
expect
(
page
).
to
have_selector
(
'ul li'
,
count:
1
)
end
end
...
...
@@ -66,7 +66,7 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
end
step
'I click attach deploy key'
do
page
.
within
'.
available
-keys'
do
page
.
within
'.
deploy
-keys'
do
click_link
'Enable'
end
end
...
...
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