Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cf3e3eff
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cf3e3eff
编写于
4月 16, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor refactoring in code related to job variables
上级
a6260b1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
24 deletion
+25
-24
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-5
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+24
-19
未找到文件。
lib/ci/gitlab_ci_yaml_processor.rb
浏览文件 @
cf3e3eff
...
@@ -45,11 +45,7 @@ module Ci
...
@@ -45,11 +45,7 @@ module Ci
end
end
def
job_variables
(
name
)
def
job_variables
(
name
)
if
job
=
@jobs
[
name
.
to_sym
]
@jobs
[
name
.
to_sym
].
try
(
:fetch
,
:variables
,
[])
||
[]
job
[
:variables
]
||
[]
else
[]
end
end
end
private
private
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
浏览文件 @
cf3e3eff
...
@@ -345,50 +345,55 @@ module Ci
...
@@ -345,50 +345,55 @@ module Ci
end
end
end
end
describe
"Variables"
do
describe
'Variables'
do
context
'when global variables are defined'
do
context
'when global variables are defined'
do
it
'returns variables'
do
it
'returns
global
variables'
do
variables
=
{
variables
=
{
var1:
"value1"
,
VAR1
:
'value1'
,
var2:
"value2"
,
VAR2
:
'value2'
,
}
}
config
=
YAML
.
dump
({
config
=
YAML
.
dump
({
variables:
variables
,
variables:
variables
,
before_script:
[
"pwd"
],
before_script:
[
'pwd'
],
rspec:
{
script:
"rspec"
}
rspec:
{
script:
'rspec'
}
})
})
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
expect
(
config_processor
.
global_variables
).
to
eq
(
variables
)
expect
(
config_processor
.
global_variables
).
to
eq
(
variables
)
end
end
end
end
context
'when job variables are defined'
do
context
'when job variables are defined'
do
let
(
:job_variables
)
{
{
KEY1
:
'value1'
,
SOME_KEY_2
:
'value2'
}
}
it
'returns job variables'
do
let
(
:yaml_config
)
do
variables
=
{
YAML
.
dump
(
KEY1
:
'value1'
,
SOME_KEY_2
:
'value2'
}
config
=
YAML
.
dump
(
{
before_script:
[
'pwd'
],
{
before_script:
[
'pwd'
],
rspec:
{
rspec:
{
variables:
job_
variables
,
variables:
variables
,
script:
'rspec'
}
script:
'rspec'
}
})
})
end
it
'returns job variables'
do
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
config
=
GitlabCiYamlProcessor
.
new
(
yaml_config
,
path
)
expect
(
config
.
job_variables
(
:rspec
)).
to
eq
job_
variables
expect
(
config
_processor
.
job_variables
(
:rspec
)).
to
eq
variables
end
end
end
end
context
'when job variables are not defined'
do
context
'when job variables are not defined'
do
it
'returns empty array'
do
it
'returns empty array'
do
config
=
YAML
.
dump
({
config
=
YAML
.
dump
({
before_script:
[
"pwd"
],
before_script:
[
'pwd'
],
rspec:
{
script:
"rspec"
}
rspec:
{
script:
'rspec'
}
})
})
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
expect
(
config_processor
.
job_variables
(
:rspec
)).
to
eq
[]
expect
(
config_processor
.
job_variables
(
:rspec
)).
to
eq
[]
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录