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
Jérome Perrin
gitlab-ce
Commits
f18eb6da
Commit
f18eb6da
authored
Feb 26, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add styling improvements in specs
parent
40f57b9b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+6
-3
No files found.
spec/models/ci/build_spec.rb
View file @
f18eb6da
...
@@ -1274,10 +1274,13 @@ describe Ci::Build do
...
@@ -1274,10 +1274,13 @@ describe Ci::Build do
describe
'#timeout'
do
describe
'#timeout'
do
set
(
:project2
)
{
create
(
:project
,
:repository
,
group:
group
,
build_timeout:
1000
)
}
set
(
:project2
)
{
create
(
:project
,
:repository
,
group:
group
,
build_timeout:
1000
)
}
set
(
:pipeline2
)
{
create
(
:ci_pipeline
,
project:
project2
,
sha:
project2
.
commit
.
id
,
ref:
project2
.
default_branch
,
status:
'success'
)
}
set
(
:pipeline2
)
{
create
(
:ci_pipeline
,
project:
project2
,
sha:
project2
.
commit
.
id
,
ref:
project2
.
default_branch
,
status:
'success'
)
}
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
)
}
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
)
}
subject
{
build
.
timeout
}
it
'returns project timeout configuration'
do
it
'returns project timeout configuration'
do
expect
(
build
.
timeout
)
.
to
eq
(
project2
.
build_timeout
)
is_expected
.
to
eq
(
project2
.
build_timeout
)
end
end
context
'when runner sets timeout to bigger value'
do
context
'when runner sets timeout to bigger value'
do
...
@@ -1285,7 +1288,7 @@ describe Ci::Build do
...
@@ -1285,7 +1288,7 @@ describe Ci::Build do
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
,
runner:
runner2
)
}
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
,
runner:
runner2
)
}
it
'returns project timeout configuration'
do
it
'returns project timeout configuration'
do
expect
(
build
.
timeout
)
.
to
eq
(
project2
.
build_timeout
)
is_expected
.
to
eq
(
project2
.
build_timeout
)
end
end
end
end
...
@@ -1294,7 +1297,7 @@ describe Ci::Build do
...
@@ -1294,7 +1297,7 @@ describe Ci::Build do
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
,
runner:
runner2
)
}
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline2
,
runner:
runner2
)
}
it
'returns project timeout configuration'
do
it
'returns project timeout configuration'
do
expect
(
build
.
timeout
)
.
to
eq
(
runner2
.
maximum_job_timeout
)
is_expected
.
to
eq
(
runner2
.
maximum_job_timeout
)
end
end
end
end
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