BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
22c983d7
Unverified
Commit
22c983d7
authored
Feb 16, 2017
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offenses
parent
a4b2e90e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
14 deletions
+11
-14
ci.rb
lib/api/helpers/ci.rb
+3
-5
ci_spec.rb
spec/requests/api/ci_spec.rb
+8
-9
No files found.
lib/api/helpers/ci.rb
View file @
22c983d7
...
...
@@ -2,9 +2,8 @@ module API
module
Helpers
module
Ci
def
runner_registration_token_valid?
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
params
[
:token
],
current_application_settings
.
runners_registration_token
)
ActiveSupport
::
SecurityUtils
.
variable_size_secure_compare
(
params
[
:token
],
current_application_settings
.
runners_registration_token
)
end
def
get_runner_version_from_params
...
...
@@ -21,4 +20,4 @@ module API
end
end
end
end
\ No newline at end of file
end
spec/requests/api/ci_spec.rb
View file @
22c983d7
...
...
@@ -54,7 +54,7 @@ describe API::Ci do
context
'when runner description is provided'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
description:
'server.hostname'
description:
'server.hostname'
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
description
).
to
eq
(
'server.hostname'
)
...
...
@@ -64,7 +64,7 @@ describe API::Ci do
context
'when runner tags are provided'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
tag_list:
'tag1, tag2'
tag_list:
'tag1, tag2'
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
tag_list
.
sort
).
to
eq
(
%w(tag1 tag2)
)
...
...
@@ -75,8 +75,8 @@ describe API::Ci do
context
'when tags are provided'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
run_untagged:
false
,
tag_list:
[
'tag'
]
run_untagged:
false
,
tag_list:
[
'tag'
]
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
false
...
...
@@ -87,7 +87,7 @@ describe API::Ci do
context
'when tags are not provided'
do
it
'returns 404 error'
do
post
api
(
'/runners'
),
token:
registration_token
,
run_untagged:
false
run_untagged:
false
expect
(
response
).
to
have_http_status
404
end
...
...
@@ -97,7 +97,7 @@ describe API::Ci do
context
'when option for locking Runner is provided'
do
it
'creates runner'
do
post
api
(
'/runners'
),
token:
registration_token
,
locked:
true
locked:
true
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
locked
).
to
be
true
...
...
@@ -110,7 +110,7 @@ describe API::Ci do
it
%q(updates provided Runner's parameter)
do
post
api
(
'/runners'
),
token:
registration_token
,
info:
{
param
=>
value
}
info:
{
param
=>
value
}
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
read_attribute
(
param
.
to_sym
)).
to
eq
(
value
)
...
...
@@ -145,4 +145,4 @@ describe API::Ci do
end
end
end
end
\ No newline at end of file
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