Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
38ffb822
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,发现更多精彩内容 >>
提交
38ffb822
编写于
3月 26, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use NotificationService for handle notify logic when MR created
上级
58a1ed6d
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
33 addition
and
18 deletion
+33
-18
app/observers/merge_request_observer.rb
app/observers/merge_request_observer.rb
+1
-3
app/services/notification_service.rb
app/services/notification_service.rb
+11
-1
spec/observers/merge_request_observer_spec.rb
spec/observers/merge_request_observer_spec.rb
+5
-14
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+16
-0
未找到文件。
app/observers/merge_request_observer.rb
浏览文件 @
38ffb822
...
...
@@ -2,9 +2,7 @@ class MergeRequestObserver < ActiveRecord::Observer
cattr_accessor
:current_user
def
after_create
(
merge_request
)
if
merge_request
.
assignee
&&
merge_request
.
assignee
!=
current_user
Notify
.
delay
.
new_merge_request_email
(
merge_request
.
id
)
end
notification
.
new_merge_request
(
merge_request
,
current_user
)
end
def
after_close
(
merge_request
,
transition
)
...
...
app/services/notification_service.rb
浏览文件 @
38ffb822
...
...
@@ -47,7 +47,7 @@ class NotificationService
end
end
# When
we reassign
an issue we should send next emails:
# When
create
an issue we should send next emails:
#
# * issue assignee if his notification level is not Disabled
#
...
...
@@ -56,4 +56,14 @@ class NotificationService
Notify
.
delay
.
new_issue_email
(
issue
.
id
)
end
end
# When create a merge request we should send next emails:
#
# * mr assignee if his notification level is not Disabled
#
def
new_merge_request
(
merge_request
,
current_user
)
if
merge_request
.
assignee
&&
merge_request
.
assignee
!=
current_user
Notify
.
delay
.
new_merge_request_email
(
merge_request
.
id
)
end
end
end
spec/observers/merge_request_observer_spec.rb
浏览文件 @
38ffb822
...
...
@@ -10,7 +10,8 @@ describe MergeRequestObserver do
let
(
:closed_assigned_mr
)
{
create
(
:closed_merge_request
,
assignee:
assignee
,
author:
author
)
}
let
(
:closed_unassigned_mr
)
{
create
(
:closed_merge_request
,
author:
author
)
}
before
(
:each
)
{
subject
.
stub
(
:current_user
).
and_return
(
some_user
)
}
before
{
subject
.
stub
(
:current_user
).
and_return
(
some_user
)
}
before
{
subject
.
stub
(
notification:
mock
(
'NotificationService'
).
as_null_object
)
}
subject
{
MergeRequestObserver
.
instance
}
...
...
@@ -18,21 +19,11 @@ describe MergeRequestObserver do
it
'is called when a merge request is created'
do
subject
.
should_receive
(
:after_create
)
MergeRequest
.
observers
.
enable
:merge_request_observer
do
create
(
:merge_request
,
project:
create
(
:project
))
end
end
it
'sends an email to the assignee'
do
Notify
.
should_receive
(
:new_merge_request_email
).
with
(
mr_mock
.
id
)
subject
.
after_create
(
mr_mock
)
end
it
'does not send an email to the assignee if assignee created the merge request'
do
subject
.
stub
(
:current_user
).
and_return
(
assignee
)
Notify
.
should_not_receive
(
:new_merge_request_email
)
it
'trigger notification service'
do
subject
.
should_receive
(
:notification
)
subject
.
after_create
(
mr_mock
)
end
end
...
...
spec/services/notification_service_spec.rb
浏览文件 @
38ffb822
...
...
@@ -44,4 +44,20 @@ describe NotificationService do
end
end
end
describe
'Merge Requests'
do
let
(
:merge_request
)
{
create
:merge_request
,
assignee:
create
(
:user
)
}
describe
:new_merge_request
do
it
'should send email to merge_request assignee'
do
Notify
.
should_receive
(
:new_merge_request_email
).
with
(
merge_request
.
id
)
notification
.
new_merge_request
(
merge_request
,
merge_request
.
author
)
end
it
'should not send email to merge_request assignee if he is current_user'
do
Notify
.
should_not_receive
(
:new_merge_request_email
).
with
(
merge_request
.
id
)
notification
.
new_merge_request
(
merge_request
,
merge_request
.
assignee
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录