Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
95662468
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,体验更适合开发者的 AI 搜索 >>
提交
95662468
编写于
4月 24, 2017
作者:
T
Toon Claes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify specs and remove unnecessary attributes
上级
14642e3c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
13 deletion
+4
-13
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+3
-11
spec/workers/expire_pipeline_cache_worker_spec.rb
spec/workers/expire_pipeline_cache_worker_spec.rb
+1
-2
未找到文件。
spec/models/ci/pipeline_spec.rb
浏览文件 @
95662468
...
@@ -1040,23 +1040,15 @@ describe Ci::Pipeline, models: true do
...
@@ -1040,23 +1040,15 @@ describe Ci::Pipeline, models: true do
describe
"#all_merge_requests"
do
describe
"#all_merge_requests"
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
,
sha:
'a288a022a53a5a944fae87bcec6efc87b7061808'
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
)
}
it
"returns merge request if pipeline runs on `diff_head_sha`"
do
merge_request
=
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:diff_head_sha
)
{
'a288a022a53a5a944fae87bcec6efc87b7061808'
}
expect
(
pipeline
.
all_merge_requests
).
to
eq
([
merge_request
])
it
"returns all merge requests having the same source branch"
do
end
it
"returns merge request if pipeline runs any commit of the `source_branch`"
do
merge_request
=
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
merge_request
=
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:diff_head_sha
)
{
'97de212e80737a608d939f648d959671fb0a0142b'
}
expect
(
pipeline
.
all_merge_requests
).
to
eq
([
merge_request
])
expect
(
pipeline
.
all_merge_requests
).
to
eq
([
merge_request
])
end
end
it
"doesn't return merge request
if pipeline runs on a different `source_branch`
"
do
it
"doesn't return merge request
s having a different source branch
"
do
create
(
:merge_request
,
source_project:
project
,
source_branch:
'feature'
,
target_branch:
'master'
)
create
(
:merge_request
,
source_project:
project
,
source_branch:
'feature'
,
target_branch:
'master'
)
expect
(
pipeline
.
all_merge_requests
).
to
be_empty
expect
(
pipeline
.
all_merge_requests
).
to
be_empty
...
...
spec/workers/expire_pipeline_cache_worker_spec.rb
浏览文件 @
95662468
...
@@ -18,8 +18,7 @@ describe ExpirePipelineCacheWorker do
...
@@ -18,8 +18,7 @@ describe ExpirePipelineCacheWorker do
end
end
it
'invalidates Etag caching for merge request pipelines if pipeline runs on any commit of that source branch'
do
it
'invalidates Etag caching for merge request pipelines if pipeline runs on any commit of that source branch'
do
project
=
create
(
:project
,
:repository
)
pipeline
=
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
)
pipeline
=
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
,
sha:
project
.
repository
.
commit
(
'master^'
).
id
)
merge_request
=
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
merge_request
=
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
merge_request_pipelines_path
=
"/
#{
project
.
full_path
}
/merge_requests/
#{
merge_request
.
iid
}
/pipelines.json"
merge_request_pipelines_path
=
"/
#{
project
.
full_path
}
/merge_requests/
#{
merge_request
.
iid
}
/pipelines.json"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录