Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c7b425a3
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 搜索 >>
提交
c7b425a3
编写于
2月 09, 2017
作者:
J
Jarka Kadlecova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Mark as WIP based on MR commits only
上级
75244061
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
10 deletion
+37
-10
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+5
-1
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+32
-9
未找到文件。
app/services/merge_requests/refresh_service.rb
浏览文件 @
c7b425a3
...
...
@@ -144,7 +144,11 @@ module MergeRequests
return
unless
@commits
.
present?
merge_requests_for_source_branch
.
each
do
|
merge_request
|
wip_commit
=
@commits
.
detect
(
&
:work_in_progress?
)
commit_shas
=
merge_request
.
commits_sha
wip_commit
=
@commits
.
detect
do
|
commit
|
commit
.
work_in_progress?
&&
commit_shas
.
include?
(
commit
.
sha
)
end
if
wip_commit
&&
!
merge_request
.
work_in_progress?
merge_request
.
update
(
title:
merge_request
.
wip_title
)
...
...
spec/services/merge_requests/refresh_service_spec.rb
浏览文件 @
c7b425a3
...
...
@@ -287,41 +287,64 @@ describe MergeRequests::RefreshService, services: true do
it
'references the commit that caused the Work in Progress status'
do
refresh_service
.
execute
(
@oldrev
,
@newrev
,
'refs/heads/master'
)
allow
(
refresh_service
).
to
receive
(
:find_new_commits
)
refresh_service
.
instance_variable_set
(
"@commits"
,
[
instance_double
(
Commit
,
double
(
id:
'aaaaaaa'
,
sha:
'38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e'
,
short_id:
'aaaaaaa'
,
title:
'Fix issue'
,
work_in_progress?:
false
),
instance_double
(
Commit
,
double
(
id:
'bbbbbbb'
,
sha:
'498214de67004b1da3d820901307bed2a68a8ef6'
,
short_id:
'bbbbbbb'
,
title:
'fixup! Fix issue'
,
work_in_progress?:
true
,
to_reference:
'bbbbbbb'
),
instance_double
(
Commit
,
double
(
id:
'ccccccc'
,
sha:
'1b12f15a11fc6e62177bef08f47bc7b5ce50b141'
,
short_id:
'ccccccc'
,
title:
'fixup! Fix issue'
,
work_in_progress?:
true
,
to_reference:
'ccccccc'
),
])
refresh_service
.
execute
(
@oldrev
,
@newrev
,
'refs/heads/wip'
)
reload_mrs
expect
(
@merge_request
.
notes
.
last
.
note
).
to
eq
(
"marked as a **Work In Progress** from bbbbbbb"
)
end
it
'does not mark as WIP based on commits that do not belong to an MR'
do
allow
(
refresh_service
).
to
receive
(
:find_new_commits
)
refresh_service
.
instance_variable_set
(
"@commits"
,
[
double
(
id:
'aaaaaaa'
,
sha:
'aaaaaaa'
,
short_id:
'aaaaaaa'
,
title:
'Fix issue'
,
work_in_progress?:
false
),
double
(
id:
'bbbbbbb'
,
sha:
'bbbbbbbb'
,
short_id:
'bbbbbbb'
,
title:
'fixup! Fix issue'
,
work_in_progress?:
true
,
to_reference:
'bbbbbbb'
)
])
refresh_service
.
execute
(
@oldrev
,
@newrev
,
'refs/heads/master'
)
reload_mrs
expect
(
@merge_request
.
work_in_progress?
).
to
be_falsey
end
end
def
reload_mrs
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录