Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2e7db162
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,发现更多精彩内容 >>
提交
2e7db162
编写于
6月 08, 2017
作者:
J
Jared Deckard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Only add a description change note when no tasks are updated
上级
9cf6adc1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
10 deletion
+42
-10
app/services/issuable_base_service.rb
app/services/issuable_base_service.rb
+7
-5
spec/services/issues/update_service_spec.rb
spec/services/issues/update_service_spec.rb
+22
-5
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+13
-0
未找到文件。
app/services/issuable_base_service.rb
浏览文件 @
2e7db162
...
...
@@ -313,11 +313,13 @@ class IssuableBaseService < BaseService
end
if
issuable
.
previous_changes
.
include?
(
'description'
)
create_description_change_note
(
issuable
)
end
if
issuable
.
previous_changes
.
include?
(
'description'
)
&&
issuable
.
tasks?
create_task_status_note
(
issuable
)
if
issuable
.
tasks?
&&
issuable
.
updated_tasks
.
any?
create_task_status_note
(
issuable
)
else
# TODO: Show this note if non-task content was modified.
# https://gitlab.com/gitlab-org/gitlab-ce/issues/33577
create_description_change_note
(
issuable
)
end
end
if
issuable
.
previous_changes
.
include?
(
'time_estimate'
)
...
...
spec/services/issues/update_service_spec.rb
浏览文件 @
2e7db162
...
...
@@ -31,6 +31,13 @@ describe Issues::UpdateService, services: true do
end
end
def
find_notes
(
action
)
issue
.
notes
.
joins
(
:system_note_metadata
)
.
where
(
system_note_metadata:
{
action:
action
})
end
def
update_issue
(
opts
)
described_class
.
new
(
project
,
user
,
opts
).
execute
(
issue
)
end
...
...
@@ -330,6 +337,9 @@ describe Issues::UpdateService, services: true do
expect
(
note1
).
not_to
be_nil
expect
(
note2
).
not_to
be_nil
description_notes
=
find_notes
(
'description'
)
expect
(
description_notes
.
length
).
to
eq
(
1
)
end
end
...
...
@@ -345,6 +355,9 @@ describe Issues::UpdateService, services: true do
expect
(
note1
).
not_to
be_nil
expect
(
note2
).
not_to
be_nil
description_notes
=
find_notes
(
'description'
)
expect
(
description_notes
.
length
).
to
eq
(
1
)
end
end
...
...
@@ -354,10 +367,12 @@ describe Issues::UpdateService, services: true do
update_issue
(
description:
"- [x] Task 1
\n
- [ ] Task 3
\n
- [ ] Task 2"
)
end
it
'does not create a system note'
do
note
=
find_note
(
'marked the task **Task 2** as incomplete'
)
it
'does not create a system note for the task'
do
task_note
=
find_note
(
'marked the task **Task 2** as incomplete'
)
description_notes
=
find_notes
(
'description'
)
expect
(
note
).
to
be_nil
expect
(
task_note
).
to
be_nil
expect
(
description_notes
.
length
).
to
eq
(
2
)
end
end
...
...
@@ -368,9 +383,11 @@ describe Issues::UpdateService, services: true do
end
it
'does not create a system note referencing the position the old item'
do
note
=
find_note
(
'marked the task **Two** as incomplete'
)
task_note
=
find_note
(
'marked the task **Two** as incomplete'
)
description_notes
=
find_notes
(
'description'
)
expect
(
note
).
to
be_nil
expect
(
task_note
).
to
be_nil
expect
(
description_notes
.
length
).
to
eq
(
2
)
end
it
'does not generate a new note at all'
do
...
...
spec/services/merge_requests/update_service_spec.rb
浏览文件 @
2e7db162
...
...
@@ -30,6 +30,13 @@ describe MergeRequests::UpdateService, services: true do
end
end
def
find_notes
(
action
)
@merge_request
.
notes
.
joins
(
:system_note_metadata
)
.
where
(
system_note_metadata:
{
action:
action
})
end
def
update_merge_request
(
opts
)
@merge_request
=
MergeRequests
::
UpdateService
.
new
(
project
,
user
,
opts
).
execute
(
merge_request
)
@merge_request
.
reload
...
...
@@ -394,6 +401,9 @@ describe MergeRequests::UpdateService, services: true do
expect
(
note1
).
not_to
be_nil
expect
(
note2
).
not_to
be_nil
description_notes
=
find_notes
(
'description'
)
expect
(
description_notes
.
length
).
to
eq
(
1
)
end
end
...
...
@@ -409,6 +419,9 @@ describe MergeRequests::UpdateService, services: true do
expect
(
note1
).
not_to
be_nil
expect
(
note2
).
not_to
be_nil
description_notes
=
find_notes
(
'description'
)
expect
(
description_notes
.
length
).
to
eq
(
1
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录