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
Boxiang Sun
gitlab-ce
Commits
746e7e76
Commit
746e7e76
authored
Jan 20, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
d8e440c8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
spec/requests/ci/api/builds_spec.rb
spec/requests/ci/api/builds_spec.rb
+6
-4
No files found.
spec/requests/ci/api/builds_spec.rb
View file @
746e7e76
...
@@ -4,7 +4,7 @@ describe Ci::API::Builds do
...
@@ -4,7 +4,7 @@ describe Ci::API::Builds do
include
ApiHelpers
include
ApiHelpers
let
(
:runner
)
{
FactoryGirl
.
create
(
:ci_runner
,
tag_list:
[
"mysql"
,
"ruby"
])
}
let
(
:runner
)
{
FactoryGirl
.
create
(
:ci_runner
,
tag_list:
[
"mysql"
,
"ruby"
])
}
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
)
}
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
,
shared_runners_enabled:
false
)
}
let
(
:last_update
)
{
nil
}
let
(
:last_update
)
{
nil
}
describe
"Builds API for runners"
do
describe
"Builds API for runners"
do
...
@@ -17,6 +17,8 @@ describe Ci::API::Builds do
...
@@ -17,6 +17,8 @@ describe Ci::API::Builds do
describe
"POST /builds/register"
do
describe
"POST /builds/register"
do
let!
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
,
name:
'spinach'
,
stage:
'test'
,
stage_idx:
0
)
}
let!
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
,
name:
'spinach'
,
stage:
'test'
,
stage_idx:
0
)
}
let
(
:user_agent
)
{
'gitlab-ci-multi-runner 1.5.2 (1-5-stable; go1.6.3; linux/amd64)'
}
let
(
:user_agent
)
{
'gitlab-ci-multi-runner 1.5.2 (1-5-stable; go1.6.3; linux/amd64)'
}
let!
(
:last_update
)
{
}
let!
(
:new_update
)
{
}
before
do
before
do
stub_container_registry_config
(
enabled:
false
)
stub_container_registry_config
(
enabled:
false
)
...
@@ -43,7 +45,7 @@ describe Ci::API::Builds do
...
@@ -43,7 +45,7 @@ describe Ci::API::Builds do
context
'when last_update is outdated'
do
context
'when last_update is outdated'
do
let
(
:last_update
)
{
runner
.
ensure_runner_queue_value
}
let
(
:last_update
)
{
runner
.
ensure_runner_queue_value
}
let
!
(
:new_update
)
{
runner
.
tick_runner_queue
}
let
(
:new_update
)
{
runner
.
tick_runner_queue
}
it
'gives 204 and set a new X-GitLab-Last-Update'
do
it
'gives 204 and set a new X-GitLab-Last-Update'
do
expect
(
response
).
to
have_http_status
(
204
)
expect
(
response
).
to
have_http_status
(
204
)
...
@@ -145,10 +147,10 @@ describe Ci::API::Builds do
...
@@ -145,10 +147,10 @@ describe Ci::API::Builds do
end
end
context
'for shared runner'
do
context
'for shared runner'
do
let
(
:shared_runner
)
{
create
(
:ci_runner
,
token:
"SharedRunner"
)
}
let
!
(
:runner
)
{
create
(
:ci_runner
,
:shared
,
token:
"SharedRunner"
)
}
before
do
before
do
register_builds
shared_runner
.
token
register_builds
(
runner
.
token
)
end
end
it_behaves_like
'no builds available'
it_behaves_like
'no builds available'
...
...
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