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
5c91f922
Commit
5c91f922
authored
Mar 13, 2017
by
Tomasz Maczukin
Committed by
Lin Jen-Shin
Mar 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression in runners registration v1 api
parent
0390734b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
runners.rb
lib/ci/api/runners.rb
+2
-2
runner_spec.rb
spec/requests/api/runner_spec.rb
+3
-0
runners_spec.rb
spec/requests/ci/api/runners_spec.rb
+3
-0
No files found.
lib/ci/api/runners.rb
View file @
5c91f922
...
...
@@ -24,13 +24,13 @@ module Ci
optional
:locked
,
type:
Boolean
,
desc:
'Lock this runner for this specific project'
end
post
"register"
do
runner_params
=
declared
(
params
,
include_missing:
false
)
runner_params
=
declared
(
params
,
include_missing:
false
)
.
except
(
:token
)
runner
=
if
runner_registration_token_valid?
# Create shared runner. Requires admin access
Ci
::
Runner
.
create
(
runner_params
.
merge
(
is_shared:
true
))
elsif
project
=
Project
.
find_by
(
runners_token:
runner_
params
[
:token
])
elsif
project
=
Project
.
find_by
(
runners_token:
params
[
:token
])
# Create a specific runner for project.
project
.
runners
.
create
(
runner_params
)
end
...
...
spec/requests/api/runner_spec.rb
View file @
5c91f922
...
...
@@ -39,6 +39,7 @@ describe API::Runner do
expect
(
json_response
[
'id'
]).
to
eq
(
runner
.
id
)
expect
(
json_response
[
'token'
]).
to
eq
(
runner
.
token
)
expect
(
runner
.
run_untagged
).
to
be
true
expect
(
runner
.
token
).
not_to
eq
(
registration_token
)
end
context
'when project token is used'
do
...
...
@@ -49,6 +50,8 @@ describe API::Runner do
expect
(
response
).
to
have_http_status
201
expect
(
project
.
runners
.
size
).
to
eq
(
1
)
expect
(
Ci
::
Runner
.
first
.
token
).
not_to
eq
(
registration_token
)
expect
(
Ci
::
Runner
.
first
.
token
).
not_to
eq
(
project
.
runners_token
)
end
end
end
...
...
spec/requests/ci/api/runners_spec.rb
View file @
5c91f922
...
...
@@ -18,6 +18,7 @@ describe Ci::API::Runners do
it
'creates runner with default values'
do
expect
(
response
).
to
have_http_status
201
expect
(
Ci
::
Runner
.
first
.
run_untagged
).
to
be
true
expect
(
Ci
::
Runner
.
first
.
token
).
not_to
eq
(
registration_token
)
end
end
...
...
@@ -74,6 +75,8 @@ describe Ci::API::Runners do
it
'creates runner'
do
expect
(
response
).
to
have_http_status
201
expect
(
project
.
runners
.
size
).
to
eq
(
1
)
expect
(
Ci
::
Runner
.
first
.
token
).
not_to
eq
(
registration_token
)
expect
(
Ci
::
Runner
.
first
.
token
).
not_to
eq
(
project
.
runners_token
)
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