Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8e92e25b
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,发现更多精彩内容 >>
提交
8e92e25b
编写于
5月 22, 2018
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescue
上级
f61666c0
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
7 addition
and
24 deletion
+7
-24
db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
...igrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+0
-2
lib/gitlab/ci/pipeline/chain/create.rb
lib/gitlab/ci/pipeline/chain/create.rb
+1
-1
spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+6
-21
未找到文件。
db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
浏览文件 @
8e92e25b
...
...
@@ -3,8 +3,6 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column
:ci_pipelines
,
:iid
,
:integer
end
...
...
lib/gitlab/ci/pipeline/chain/create.rb
浏览文件 @
8e92e25b
...
...
@@ -23,7 +23,7 @@ module Gitlab
end
end
end
rescue
ActiveRecord
::
RecordInvalid
,
ActiveRecord
::
RecordNotUnique
=>
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
error
(
"Failed to persist the pipeline:
#{
e
}
"
)
end
...
...
spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
浏览文件 @
8e92e25b
...
...
@@ -37,17 +37,6 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
end
context
'when pipeline has validation errors'
do
shared_examples_for
'expectations'
do
it
'breaks the chain'
do
expect
(
step
.
break?
).
to
be
true
end
it
'appends validation error'
do
expect
(
pipeline
.
errors
.
to_a
)
.
to
include
/Failed to persist the pipeline/
end
end
context
'when ref is nil'
do
let
(
:pipeline
)
do
build
(
:ci_pipeline
,
project:
project
,
ref:
nil
)
...
...
@@ -57,18 +46,14 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
step
.
perform!
end
it_behaves_like
'expectations'
it
'breaks the chain'
do
expect
(
step
.
break?
).
to
be
true
end
context
'when pipeline has a duplicate iid'
do
before
do
allow_any_instance_of
(
Ci
::
Pipeline
).
to
receive
(
:ensure_project_iid!
)
{
|
p
|
p
.
send
(
:write_attribute
,
:iid
,
1
)
}
create
(
:ci_pipeline
,
project:
project
)
step
.
perform!
it
'appends validation error'
do
expect
(
pipeline
.
errors
.
to_a
)
.
to
include
/Failed to persist the pipeline/
end
it_behaves_like
'expectations'
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录