Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b6d0dd87
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,发现更多精彩内容 >>
提交
b6d0dd87
编写于
8月 02, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4618 from jacargentina/notification-on-commits
Fix notifications to handle participants and mentions on commits too
上级
efd1b69f
669ada92
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
25 deletion
+28
-25
app/services/notification_service.rb
app/services/notification_service.rb
+7
-7
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+21
-18
未找到文件。
app/services/notification_service.rb
浏览文件 @
b6d0dd87
...
@@ -106,15 +106,15 @@ class NotificationService
...
@@ -106,15 +106,15 @@ class NotificationService
if
note
.
commit_id
.
present?
if
note
.
commit_id
.
present?
opts
.
merge!
(
commit_id:
note
.
commit_id
)
opts
.
merge!
(
commit_id:
note
.
commit_id
)
recipients
=
[
note
.
commit_author
]
else
else
opts
.
merge!
(
noteable_id:
note
.
noteable_id
)
opts
.
merge!
(
noteable_id:
note
.
noteable_id
)
target
=
note
.
noteable
end
if
target
.
respond_to?
(
:participants
)
recipients
=
target
.
participants
target
=
note
.
noteable
else
if
target
.
respond_to?
(
:participants
)
recipients
=
[]
recipients
=
target
.
participants
end
else
recipients
=
note
.
mentioned_users
end
end
# Get users who left comment in thread
# Get users who left comment in thread
...
...
spec/services/notification_service_spec.rb
浏览文件 @
b6d0dd87
...
@@ -48,7 +48,7 @@ describe NotificationService do
...
@@ -48,7 +48,7 @@ describe NotificationService do
end
end
context
'commit note'
do
context
'commit note'
do
let
(
:note
)
{
create
:note_on_commit
}
let
(
:note
)
{
create
(
:note_on_commit
)
}
before
do
before
do
build_team
(
note
.
project
)
build_team
(
note
.
project
)
...
@@ -56,32 +56,35 @@ describe NotificationService do
...
@@ -56,32 +56,35 @@ describe NotificationService do
describe
:new_note
do
describe
:new_note
do
it
do
it
do
should_email
(
@u_watcher
.
id
)
should_email
(
@u_watcher
.
id
,
note
)
should_not_email
(
note
.
author_id
)
should_not_email
(
@u_mentioned
.
id
,
note
)
should_not_email
(
@u_participating
.
id
)
should_not_email
(
note
.
author_id
,
note
)
should_not_email
(
@u_disabled
.
id
)
should_not_email
(
@u_participating
.
id
,
note
)
should_not_email
(
@u_disabled
.
id
,
note
)
notification
.
new_note
(
note
)
notification
.
new_note
(
note
)
end
end
it
do
it
do
create
(
:note_on_commit
,
new_note
=
create
(
:note_on_commit
,
author:
@u_participating
,
author:
@u_participating
,
project_id:
note
.
project_id
,
project_id:
note
.
project_id
,
commit_id:
note
.
commit_id
)
commit_id:
note
.
commit_id
,
note:
'@mention referenced'
)
should_email
(
@u_watcher
.
id
)
should_email
(
@u_participating
.
id
)
should_email
(
@u_watcher
.
id
,
new_note
)
should_not_email
(
note
.
author_id
)
should_email
(
@u_mentioned
.
id
,
new_note
)
should_not_email
(
@u_disabled
.
id
)
should_not_email
(
new_note
.
author_id
,
new_note
)
notification
.
new_note
(
note
)
should_not_email
(
@u_participating
.
id
,
new_note
)
should_not_email
(
@u_disabled
.
id
,
new_note
)
notification
.
new_note
(
new_note
)
end
end
def
should_email
(
user_id
)
def
should_email
(
user_id
,
n
)
Notify
.
should_receive
(
:note_commit_email
).
with
(
user_id
,
n
ote
.
id
)
Notify
.
should_receive
(
:note_commit_email
).
with
(
user_id
,
n
.
id
)
end
end
def
should_not_email
(
user_id
)
def
should_not_email
(
user_id
,
n
)
Notify
.
should_not_receive
(
:note_commit_email
).
with
(
user_id
,
n
ote
.
id
)
Notify
.
should_not_receive
(
:note_commit_email
).
with
(
user_id
,
n
.
id
)
end
end
end
end
end
end
...
@@ -236,7 +239,7 @@ describe NotificationService do
...
@@ -236,7 +239,7 @@ describe NotificationService do
@u_watcher
=
create
(
:user
,
notification_level:
Notification
::
N_WATCH
)
@u_watcher
=
create
(
:user
,
notification_level:
Notification
::
N_WATCH
)
@u_participating
=
create
(
:user
,
notification_level:
Notification
::
N_PARTICIPATING
)
@u_participating
=
create
(
:user
,
notification_level:
Notification
::
N_PARTICIPATING
)
@u_disabled
=
create
(
:user
,
notification_level:
Notification
::
N_DISABLED
)
@u_disabled
=
create
(
:user
,
notification_level:
Notification
::
N_DISABLED
)
@u_mentioned
=
create
(
:user
,
username:
'mention'
,
notification_level:
Notification
::
N_
WATCH
)
@u_mentioned
=
create
(
:user
,
username:
'mention'
,
notification_level:
Notification
::
N_
PARTICIPATING
)
project
.
team
<<
[
@u_watcher
,
:master
]
project
.
team
<<
[
@u_watcher
,
:master
]
project
.
team
<<
[
@u_participating
,
:master
]
project
.
team
<<
[
@u_participating
,
:master
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录