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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a0b90c7f
Commit
a0b90c7f
authored
Dec 21, 2017
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build factory to have properly filled started and finished date
parent
2c417402
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+16
-9
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+1
-1
No files found.
spec/factories/ci/builds.rb
View file @
a0b90c7f
...
@@ -7,12 +7,10 @@ FactoryBot.define do
...
@@ -7,12 +7,10 @@ FactoryBot.define do
stage_idx
0
stage_idx
0
ref
'master'
ref
'master'
tag
false
tag
false
status
'pending'
created_at
'Di 29. Okt 09:50:00 CET 2013'
started_at
'Di 29. Okt 09:51:28 CET 2013'
finished_at
'Di 29. Okt 09:53:28 CET 2013'
commands
'ls -a'
commands
'ls -a'
protected
false
protected
false
created_at
'Di 29. Okt 09:50:00 CET 2013'
pending
options
do
options
do
{
{
...
@@ -29,23 +27,37 @@ FactoryBot.define do
...
@@ -29,23 +27,37 @@ FactoryBot.define do
pipeline
factory: :ci_pipeline
pipeline
factory: :ci_pipeline
trait
:started
do
started_at
'Di 29. Okt 09:51:28 CET 2013'
end
trait
:finished
do
started
finished_at
'Di 29. Okt 09:53:28 CET 2013'
end
trait
:success
do
trait
:success
do
finished
status
'success'
status
'success'
end
end
trait
:failed
do
trait
:failed
do
finished
status
'failed'
status
'failed'
end
end
trait
:canceled
do
trait
:canceled
do
finished
status
'canceled'
status
'canceled'
end
end
trait
:skipped
do
trait
:skipped
do
started
status
'skipped'
status
'skipped'
end
end
trait
:running
do
trait
:running
do
started
status
'running'
status
'running'
end
end
...
@@ -114,11 +126,6 @@ FactoryBot.define do
...
@@ -114,11 +126,6 @@ FactoryBot.define do
build
.
project
||=
build
.
pipeline
.
project
build
.
project
||=
build
.
pipeline
.
project
end
end
factory
:ci_not_started_build
do
started_at
nil
finished_at
nil
end
trait
:tag
do
trait
:tag
do
tag
true
tag
true
end
end
...
...
spec/features/projects/jobs_spec.rb
View file @
a0b90c7f
...
@@ -371,7 +371,7 @@ feature 'Jobs' do
...
@@ -371,7 +371,7 @@ feature 'Jobs' do
end
end
context
'Playable manual action'
do
context
'Playable manual action'
do
let
(
:
build
)
{
create
(
:ci_build
,
:playable
,
pipeline:
pipeline
)
}
let
(
:
job
)
{
create
(
:ci_build
,
:playable
,
pipeline:
pipeline
)
}
before
do
before
do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
...
...
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