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
990bd06c
Commit
990bd06c
authored
Jan 13, 2016
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change :ci_build_canceled factory to :canceled trait
parent
97338496
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+4
-4
spec/requests/api/builds_spec.rb
spec/requests/api/builds_spec.rb
+1
-1
No files found.
spec/factories/ci/builds.rb
View file @
990bd06c
...
@@ -43,6 +43,10 @@ FactoryGirl.define do
...
@@ -43,6 +43,10 @@ FactoryGirl.define do
commit
factory: :ci_commit
commit
factory: :ci_commit
trait
:canceled
do
status
'canceled'
end
after
(
:build
)
do
|
build
,
evaluator
|
after
(
:build
)
do
|
build
,
evaluator
|
build
.
project
=
build
.
commit
.
project
build
.
project
=
build
.
commit
.
project
end
end
...
@@ -62,9 +66,5 @@ FactoryGirl.define do
...
@@ -62,9 +66,5 @@ FactoryGirl.define do
build
.
trace
=
'BUILD TRACE'
build
.
trace
=
'BUILD TRACE'
end
end
end
end
factory
:ci_build_canceled
do
status
'canceled'
end
end
end
end
end
spec/requests/api/builds_spec.rb
View file @
990bd06c
...
@@ -11,7 +11,7 @@ describe API::API, api: true do
...
@@ -11,7 +11,7 @@ describe API::API, api: true do
let
(
:commit
)
{
create
(
:ci_commit
,
project:
project
)}
let
(
:commit
)
{
create
(
:ci_commit
,
project:
project
)}
let
(
:build
)
{
create
(
:ci_build
,
commit:
commit
)
}
let
(
:build
)
{
create
(
:ci_build
,
commit:
commit
)
}
let
(
:build_with_trace
)
{
create
(
:ci_build_with_trace
,
commit:
commit
)
}
let
(
:build_with_trace
)
{
create
(
:ci_build_with_trace
,
commit:
commit
)
}
let
(
:build_canceled
)
{
create
(
:ci_build
_
canceled
,
commit:
commit
)
}
let
(
:build_canceled
)
{
create
(
:ci_build
,
:
canceled
,
commit:
commit
)
}
describe
'GET /projects/:id/builds '
do
describe
'GET /projects/:id/builds '
do
context
'authorized user'
do
context
'authorized user'
do
...
...
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