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
dc3a41f4
Commit
dc3a41f4
authored
Mar 03, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests for added default cache key
parent
12752043
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
8 deletions
+21
-8
lib/gitlab/ci/config/entry/node.rb
lib/gitlab/ci/config/entry/node.rb
+12
-2
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+9
-6
No files found.
lib/gitlab/ci/config/entry/node.rb
View file @
dc3a41f4
...
@@ -76,8 +76,18 @@ module Gitlab
...
@@ -76,8 +76,18 @@ module Gitlab
end
end
def
inspect
def
inspect
val
=
if
leaf?
then
config
else
descendants
end
val
=
if
leaf?
unspecified
=
if
specified?
then
''
else
'(unspecified) '
end
config
else
descendants
end
unspecified
=
if
specified?
''
else
'(unspecified) '
end
"#<
#{
self
.
class
.
name
}
#{
unspecified
}
{
#{
key
}
:
#{
val
.
inspect
}
}>"
"#<
#{
self
.
class
.
name
}
#{
unspecified
}
{
#{
key
}
:
#{
val
.
inspect
}
}>"
end
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
dc3a41f4
...
@@ -51,7 +51,7 @@ module Ci
...
@@ -51,7 +51,7 @@ module Ci
commands:
"pwd
\n
rspec"
,
commands:
"pwd
\n
rspec"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{},
options:
{
cache:
{
key:
'default'
}
},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
environment:
nil
,
environment:
nil
,
...
@@ -468,7 +468,8 @@ module Ci
...
@@ -468,7 +468,8 @@ module Ci
tag_list:
[],
tag_list:
[],
options:
{
options:
{
image:
"ruby:2.1"
,
image:
"ruby:2.1"
,
services:
[
"mysql"
]
services:
[
"mysql"
],
cache:
{
key:
'default'
}
},
},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
...
@@ -497,7 +498,8 @@ module Ci
...
@@ -497,7 +498,8 @@ module Ci
tag_list:
[],
tag_list:
[],
options:
{
options:
{
image:
"ruby:2.5"
,
image:
"ruby:2.5"
,
services:
[
"postgresql"
]
services:
[
"postgresql"
],
cache:
{
key:
'default'
}
},
},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
...
@@ -738,6 +740,7 @@ module Ci
...
@@ -738,6 +740,7 @@ module Ci
options:
{
options:
{
image:
"ruby:2.1"
,
image:
"ruby:2.1"
,
services:
[
"mysql"
],
services:
[
"mysql"
],
cache:
{
key:
'default'
},
artifacts:
{
artifacts:
{
name:
"custom_name"
,
name:
"custom_name"
,
paths:
[
"logs/"
,
"binaries/"
],
paths:
[
"logs/"
,
"binaries/"
],
...
@@ -947,7 +950,7 @@ module Ci
...
@@ -947,7 +950,7 @@ module Ci
commands:
"test"
,
commands:
"test"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{},
options:
{
cache:
{
key:
'default'
}
},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
@@ -993,7 +996,7 @@ module Ci
...
@@ -993,7 +996,7 @@ module Ci
commands:
"execute-script-for-job"
,
commands:
"execute-script-for-job"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{},
options:
{
cache:
{
key:
'default'
}
},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
@@ -1006,7 +1009,7 @@ module Ci
...
@@ -1006,7 +1009,7 @@ module Ci
commands:
"execute-script-for-job"
,
commands:
"execute-script-for-job"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{},
options:
{
cache:
{
key:
'default'
}
},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
...
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