Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
348e346d
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,发现更多精彩内容 >>
提交
348e346d
编写于
2月 05, 2019
作者:
H
Hiroyuki Sato
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix false-positive spec
上级
74946c19
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
18 deletion
+18
-18
spec/services/merge_requests/create_service_spec.rb
spec/services/merge_requests/create_service_spec.rb
+18
-18
未找到文件。
spec/services/merge_requests/create_service_spec.rb
浏览文件 @
348e346d
...
...
@@ -197,6 +197,24 @@ describe MergeRequests::CreateService do
expect
(
merge_request
.
actual_head_pipeline
).
to
be_merge_request
end
context
'when there are no commits between source branch and target branch'
do
let
(
:opts
)
do
{
title:
'Awesome merge_request'
,
description:
'please fix'
,
source_branch:
'not-merged-branch'
,
target_branch:
'master'
}
end
it
'does not create a merge request pipeline'
do
expect
(
merge_request
).
to
be_persisted
merge_request
.
reload
expect
(
merge_request
.
merge_request_pipelines
.
count
).
to
eq
(
0
)
end
end
context
"when branch pipeline was created before a merge request pipline has been created"
do
before
do
create
(
:ci_pipeline
,
project:
merge_request
.
source_project
,
...
...
@@ -226,24 +244,6 @@ describe MergeRequests::CreateService do
end
end
context
'when there are no commits between source branch and target branch'
do
let
(
:opts
)
do
{
title:
'Awesome merge_request'
,
description:
'please fix'
,
source_branch:
'not-merged-branch'
,
target_branch:
'master'
}
end
it
'does not create a merge request pipeline'
do
expect
(
merge_request
).
to
be_persisted
merge_request
.
reload
expect
(
merge_request
.
merge_request_pipelines
.
count
).
to
eq
(
0
)
end
end
context
"when .gitlab-ci.yml does not have merge_requests keywords"
do
let
(
:config
)
do
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录