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
16ff3229
Commit
16ff3229
authored
Jun 30, 2017
by
Tomasz Maczukin
Committed by
Grzegorz Bizon
Jul 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offenses
parent
dcdf2a8b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/image_spec.rb
spec/lib/gitlab/ci/config/entry/image_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/service_spec.rb
spec/lib/gitlab/ci/config/entry/service_spec.rb
+3
-3
No files found.
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
16ff3229
...
@@ -651,7 +651,7 @@ module Ci
...
@@ -651,7 +651,7 @@ module Ci
options:
{
options:
{
image:
{
name:
"ruby:2.5"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
image:
{
name:
"ruby:2.5"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
]
},
services:
[{
name:
"postgresql"
,
alias:
"db-pg"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
],
services:
[{
name:
"postgresql"
,
alias:
"db-pg"
,
entrypoint:
[
"/usr/local/bin/init"
,
"run"
],
command:
[
"/usr/local/bin/init"
,
"run"
]},
command:
[
"/usr/local/bin/init"
,
"run"
]
},
{
name:
"docker:dind"
}]
{
name:
"docker:dind"
}]
},
},
allow_failure:
false
,
allow_failure:
false
,
...
...
spec/lib/gitlab/ci/config/entry/image_spec.rb
View file @
16ff3229
...
@@ -38,7 +38,7 @@ describe Gitlab::Ci::Config::Entry::Image do
...
@@ -38,7 +38,7 @@ describe Gitlab::Ci::Config::Entry::Image do
end
end
context
'when configuration is a hash'
do
context
'when configuration is a hash'
do
let
(
:config
)
{
{
name:
'ruby:2.2'
,
entrypoint:
[
'/bin/sh'
,
'run'
]
}
}
let
(
:config
)
{
{
name:
'ruby:2.2'
,
entrypoint:
%w(/bin/sh run)
}
}
describe
'#value'
do
describe
'#value'
do
it
'returns image hash'
do
it
'returns image hash'
do
...
@@ -66,7 +66,7 @@ describe Gitlab::Ci::Config::Entry::Image do
...
@@ -66,7 +66,7 @@ describe Gitlab::Ci::Config::Entry::Image do
describe
'#entrypoint'
do
describe
'#entrypoint'
do
it
"returns image's entrypoint"
do
it
"returns image's entrypoint"
do
expect
(
entry
.
entrypoint
).
to
eq
[
'/bin/sh'
,
'run'
]
expect
(
entry
.
entrypoint
).
to
eq
%w(/bin/sh run)
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/service_spec.rb
View file @
16ff3229
...
@@ -43,7 +43,7 @@ describe Gitlab::Ci::Config::Entry::Service do
...
@@ -43,7 +43,7 @@ describe Gitlab::Ci::Config::Entry::Service do
context
'when configuration is a hash'
do
context
'when configuration is a hash'
do
let
(
:config
)
do
let
(
:config
)
do
{
name:
'postgresql:9.5'
,
alias:
'db'
,
command:
[
'cmd'
,
'run'
],
entrypoint:
[
'/bin/sh'
,
'run'
]
}
{
name:
'postgresql:9.5'
,
alias:
'db'
,
command:
%w(cmd run)
,
entrypoint:
%w(/bin/sh run)
}
end
end
describe
'#valid?'
do
describe
'#valid?'
do
...
@@ -72,13 +72,13 @@ describe Gitlab::Ci::Config::Entry::Service do
...
@@ -72,13 +72,13 @@ describe Gitlab::Ci::Config::Entry::Service do
describe
'#command'
do
describe
'#command'
do
it
"returns service's command"
do
it
"returns service's command"
do
expect
(
entry
.
command
).
to
eq
[
'cmd'
,
'run'
]
expect
(
entry
.
command
).
to
eq
%w(cmd run)
end
end
end
end
describe
'#entrypoint'
do
describe
'#entrypoint'
do
it
"returns service's entrypoint"
do
it
"returns service's entrypoint"
do
expect
(
entry
.
entrypoint
).
to
eq
[
'/bin/sh'
,
'run'
]
expect
(
entry
.
entrypoint
).
to
eq
%w(/bin/sh run)
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