Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
4cc77c3b
Commit
4cc77c3b
authored
May 19, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor runner-related code refactorings
parent
c3c503d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
21 deletions
+22
-21
app/controllers/admin/runners_controller.rb
app/controllers/admin/runners_controller.rb
+10
-9
app/views/projects/runners/_form.html.haml
app/views/projects/runners/_form.html.haml
+1
-1
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+1
-1
spec/requests/ci/api/runners_spec.rb
spec/requests/ci/api/runners_spec.rb
+10
-10
No files found.
app/controllers/admin/runners_controller.rb
View file @
4cc77c3b
...
...
@@ -9,17 +9,18 @@ def index
end
def
show
set
_builds_and_projects
assign
_builds_and_projects
end
def
update
unless
@runner
.
update_attributes
(
runner_params
)
set_builds_and_projects
and
return
render
'show'
end
respond_to
do
|
format
|
format
.
js
format
.
html
{
redirect_to
admin_runner_path
(
@runner
)
}
if
@runner
.
update_attributes
(
runner_params
)
respond_to
do
|
format
|
format
.
js
format
.
html
{
redirect_to
admin_runner_path
(
@runner
)
}
end
else
assign_builds_and_projects
render
'show'
end
end
...
...
@@ -55,7 +56,7 @@ def runner_params
params
.
require
(
:runner
).
permit
(
Ci
::
Runner
::
FORM_EDITABLE
)
end
def
set
_builds_and_projects
def
assign
_builds_and_projects
@builds
=
runner
.
builds
.
order
(
'id DESC'
).
first
(
30
)
@projects
=
if
params
[
:search
].
present?
...
...
app/views/projects/runners/_form.html.haml
View file @
4cc77c3b
...
...
@@ -11,7 +11,7 @@
.col-sm-10
.checkbox
=
f
.
check_box
:run_untagged
%span
.light
Indicates whether runner can pick jobs without tags
%span
.light
Indicates whether
this
runner can pick jobs without tags
.form-group
=
label_tag
:token
,
class:
'control-label'
do
Token
...
...
spec/features/runners_spec.rb
View file @
4cc77c3b
...
...
@@ -129,7 +129,7 @@
context
'when runner has tags'
do
before
{
runner
.
update_attribute
(
:tag_list
,
[
'tag'
])
}
scenario
'user want to prevent runner from running untagged job'
do
scenario
'user want
s
to prevent runner from running untagged job'
do
visit
runners_path
(
project
)
page
.
within
(
'.activated-specific-runners'
)
do
first
(
'small > a'
).
click
...
...
spec/requests/ci/api/runners_spec.rb
View file @
4cc77c3b
...
...
@@ -16,7 +16,7 @@
before
{
post
ci_api
(
"/runners/register"
),
token:
registration_token
}
it
'creates runner with default values'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
true
end
end
...
...
@@ -28,7 +28,7 @@
end
it
'creates runner'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
description
).
to
eq
(
"server.hostname"
)
end
end
...
...
@@ -40,7 +40,7 @@
end
it
'creates runner'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
tag_list
.
sort
).
to
eq
([
"tag1"
,
"tag2"
])
end
end
...
...
@@ -52,7 +52,7 @@
run_untagged:
false
,
tag_list:
[
'tag'
]
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
false
end
end
...
...
@@ -62,7 +62,7 @@
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
run_untagged:
false
expect
(
response
.
status
).
to
eq
(
404
)
expect
(
response
).
to
have_http_status
404
end
end
end
...
...
@@ -72,7 +72,7 @@
before
{
post
ci_api
(
"/runners/register"
),
token:
project
.
runners_token
}
it
'creates runner'
do
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
expect
(
project
.
runners
.
size
).
to
eq
(
1
)
end
end
...
...
@@ -81,7 +81,7 @@
it
'returns 403 error'
do
post
ci_api
(
"/runners/register"
),
token:
'invalid'
expect
(
response
.
status
).
to
eq
(
403
)
expect
(
response
).
to
have_http_status
403
end
end
...
...
@@ -89,7 +89,7 @@
it
'returns 400 error'
do
post
ci_api
(
"/runners/register"
)
expect
(
response
.
status
).
to
eq
(
400
)
expect
(
response
).
to
have_http_status
400
end
end
...
...
@@ -101,7 +101,7 @@
it
do
post
ci_api
(
"/runners/register"
),
token:
registration_token
,
info:
{
param
=>
value
}
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
response
).
to
have_http_status
201
is_expected
.
to
eq
(
value
)
end
end
...
...
@@ -112,7 +112,7 @@
let!
(
:runner
)
{
FactoryGirl
.
create
(
:ci_runner
)
}
before
{
delete
ci_api
(
"/runners/delete"
),
token:
runner
.
token
}
it
{
expect
(
response
.
status
).
to
eq
(
200
)
}
it
{
expect
(
response
).
to
have_http_status
200
}
it
{
expect
(
Ci
::
Runner
.
count
).
to
eq
(
0
)
}
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