Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
616d1e10
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,发现更多精彩内容 >>
提交
616d1e10
编写于
10月 10, 2017
作者:
J
Jarka Kadlecova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix text for the merge request lock system note
上级
100a7c6b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
3 deletion
+41
-3
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-1
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+2
-2
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+38
-0
未找到文件。
app/services/system_note_service.rb
浏览文件 @
616d1e10
...
...
@@ -593,7 +593,7 @@ module SystemNoteService
def
discussion_lock
(
issuable
,
author
)
action
=
issuable
.
discussion_locked?
?
'locked'
:
'unlocked'
body
=
"
#{
action
}
this
issue
"
body
=
"
#{
action
}
this
#{
issuable
.
class
.
to_s
.
titleize
.
downcase
}
"
create_note
(
NoteSummary
.
new
(
issuable
,
issuable
.
project
,
author
,
body
,
action:
action
))
end
...
...
spec/services/merge_requests/update_service_spec.rb
浏览文件 @
616d1e10
...
...
@@ -127,10 +127,10 @@ describe MergeRequests::UpdateService, :mailer do
end
it
'creates system note about discussion lock'
do
note
=
find_note
(
'locked this
issue
'
)
note
=
find_note
(
'locked this
merge request
'
)
expect
(
note
).
not_to
be_nil
expect
(
note
.
note
).
to
eq
'locked this
issue
'
expect
(
note
.
note
).
to
eq
'locked this
merge request
'
end
context
'when not including source branch removal options'
do
...
...
spec/services/system_note_service_spec.rb
浏览文件 @
616d1e10
...
...
@@ -1145,4 +1145,42 @@ describe SystemNoteService do
it
{
expect
(
subject
.
note
).
to
eq
"marked
#{
duplicate_issue
.
to_reference
(
project
)
}
as a duplicate of this issue"
}
end
end
describe
'.discussion_lock'
do
subject
{
described_class
.
discussion_lock
(
noteable
,
author
)
}
context
'discussion unlocked'
do
it_behaves_like
'a system note'
do
let
(
:action
)
{
'unlocked'
}
end
it
'creates the note text correctly'
do
[
:issue
,
:merge_request
].
each
do
|
type
|
issuable
=
create
(
type
)
expect
(
described_class
.
discussion_lock
(
issuable
,
author
).
note
)
.
to
eq
(
"unlocked this
#{
type
.
to_s
.
titleize
.
downcase
}
"
)
end
end
end
context
'discussion locked'
do
before
do
noteable
.
update_attribute
(
:discussion_locked
,
true
)
end
it_behaves_like
'a system note'
do
let
(
:action
)
{
'locked'
}
end
it
'creates the note text correctly'
do
[
:issue
,
:merge_request
].
each
do
|
type
|
issuable
=
create
(
type
,
discussion_locked:
true
)
expect
(
described_class
.
discussion_lock
(
issuable
,
author
).
note
)
.
to
eq
(
"locked this
#{
type
.
to_s
.
titleize
.
downcase
}
"
)
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录