Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
24807014
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,发现更多精彩内容 >>
提交
24807014
编写于
7月 09, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extend CI job entries fabrication and validation
上级
a80a01e8
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
52 addition
and
24 deletion
+52
-24
lib/gitlab/ci/config/node/global.rb
lib/gitlab/ci/config/node/global.rb
+1
-0
lib/gitlab/ci/config/node/hidden_job.rb
lib/gitlab/ci/config/node/hidden_job.rb
+1
-0
lib/gitlab/ci/config/node/job.rb
lib/gitlab/ci/config/node/job.rb
+4
-0
lib/gitlab/ci/config/node/jobs.rb
lib/gitlab/ci/config/node/jobs.rb
+10
-8
spec/lib/gitlab/ci/config/node/global_spec.rb
spec/lib/gitlab/ci/config/node/global_spec.rb
+1
-1
spec/lib/gitlab/ci/config/node/hidden_job_spec.rb
spec/lib/gitlab/ci/config/node/hidden_job_spec.rb
+10
-0
spec/lib/gitlab/ci/config/node/job_spec.rb
spec/lib/gitlab/ci/config/node/job_spec.rb
+10
-0
spec/lib/gitlab/ci/config/node/jobs_spec.rb
spec/lib/gitlab/ci/config/node/jobs_spec.rb
+15
-15
未找到文件。
lib/gitlab/ci/config/node/global.rb
浏览文件 @
24807014
...
...
@@ -38,6 +38,7 @@ module Gitlab
def
initialize
(
*
)
super
@global
=
self
end
...
...
lib/gitlab/ci/config/node/hidden_job.rb
浏览文件 @
24807014
...
...
@@ -10,6 +10,7 @@ module Gitlab
validations
do
validates
:config
,
type:
Hash
validates
:config
,
presence:
true
end
def
relevant?
...
...
lib/gitlab/ci/config/node/job.rb
浏览文件 @
24807014
...
...
@@ -8,6 +8,10 @@ module Gitlab
class
Job
<
Entry
include
Configurable
validations
do
validates
:config
,
presence:
true
end
node
:stage
,
Stage
,
description:
'Pipeline stage this job will be executed into.'
...
...
lib/gitlab/ci/config/node/jobs.rb
浏览文件 @
24807014
...
...
@@ -30,17 +30,19 @@ module Gitlab
private
def
create
(
name
,
config
)
job_node
(
name
).
new
(
config
,
job_attributes
(
name
))
Node
::
Factory
.
new
(
job_node
(
name
))
.
value
(
config
||
{})
.
with
(
key:
name
,
parent:
self
,
global:
@global
)
.
with
(
description:
"
#{
name
}
job definition."
)
.
create!
end
def
job_node
(
name
)
name
.
to_s
.
start_with?
(
'.'
)
?
Node
::
HiddenJob
:
Node
::
Job
if
name
.
to_s
.
start_with?
(
'.'
)
Node
::
HiddenJob
else
Node
::
Job
end
def
job_attributes
(
name
)
@attributes
.
merge
(
key:
name
,
parent:
self
,
description:
"
#{
name
}
job definition."
)
end
end
end
...
...
spec/lib/gitlab/ci/config/node/global_spec.rb
浏览文件 @
24807014
...
...
@@ -137,7 +137,7 @@ describe Gitlab::Ci::Config::Node::Global do
end
context
'when most of entires not defined'
do
let
(
:hash
)
{
{
cache:
{
key:
'a'
},
rspec:
{}
}
}
let
(
:hash
)
{
{
cache:
{
key:
'a'
},
rspec:
{
script:
%w[ls]
}
}
}
before
{
global
.
process!
}
describe
'#nodes'
do
...
...
spec/lib/gitlab/ci/config/node/hidden_job_spec.rb
浏览文件 @
24807014
...
...
@@ -31,6 +31,16 @@ describe Gitlab::Ci::Config::Node::HiddenJob do
end
end
end
context
'when config is empty'
do
let
(
:config
)
{
{}
}
describe
'#valid'
do
it
'is invalid'
do
expect
(
entry
).
not_to
be_valid
end
end
end
end
end
...
...
spec/lib/gitlab/ci/config/node/job_spec.rb
浏览文件 @
24807014
...
...
@@ -39,6 +39,16 @@ describe Gitlab::Ci::Config::Node::Job do
end
end
end
context
'when config is empty'
do
let
(
:config
)
{
{}
}
describe
'#valid'
do
it
'is invalid'
do
expect
(
entry
).
not_to
be_valid
end
end
end
end
end
...
...
spec/lib/gitlab/ci/config/node/jobs_spec.rb
浏览文件 @
24807014
...
...
@@ -4,6 +4,11 @@ describe Gitlab::Ci::Config::Node::Jobs do
let
(
:entry
)
{
described_class
.
new
(
config
,
global:
spy
)
}
describe
'validations'
do
before
do
entry
.
process!
entry
.
validate!
end
context
'when entry config value is correct'
do
let
(
:config
)
{
{
rspec:
{
script:
'rspec'
}
}
}
...
...
@@ -25,20 +30,16 @@ describe Gitlab::Ci::Config::Node::Jobs do
end
end
context
'when
no visible jobs present
'
do
let
(
:config
)
{
{
'.hidden'
.
to_sym
=>
{}
}
}
context
'when
job is unspecified
'
do
let
(
:config
)
{
{
rspec:
nil
}
}
context
'when not processed'
do
it
'is valid'
do
expect
(
entry
.
errors
).
to
be_empty
it
'is not valid'
do
expect
(
entry
).
not_to
be_valid
end
end
context
'when processed'
do
before
do
entry
.
process!
entry
.
validate!
end
context
'when no visible jobs present'
do
let
(
:config
)
{
{
'.hidden'
.
to_sym
=>
{
script:
[]
}
}
}
it
'returns error about no visible jobs defined'
do
expect
(
entry
.
errors
)
...
...
@@ -48,7 +49,6 @@ describe Gitlab::Ci::Config::Node::Jobs do
end
end
end
end
context
'when valid job entries processed'
do
before
{
entry
.
process!
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录