Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c04120c1
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,发现更多精彩内容 >>
提交
c04120c1
编写于
3月 28, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve notification service tests
上级
f49a2ac0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
11 deletion
+22
-11
app/mailers/emails/issues.rb
app/mailers/emails/issues.rb
+1
-1
app/services/notification_service.rb
app/services/notification_service.rb
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+20
-9
未找到文件。
app/mailers/emails/issues.rb
浏览文件 @
c04120c1
...
...
@@ -13,7 +13,7 @@ module Emails
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"changed issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
end
def
close_issue_email
(
recipient_id
,
issue_id
,
updated_by_user_id
)
def
close
d
_issue_email
(
recipient_id
,
issue_id
,
updated_by_user_id
)
@issue
=
Issue
.
find
issue_id
@project
=
@issue
.
project
@updated_by
=
User
.
find
updated_by_user_id
...
...
app/services/notification_service.rb
浏览文件 @
c04120c1
...
...
@@ -33,7 +33,7 @@ class NotificationService
# * project team members with notification level higher then Participating
#
def
close_issue
(
issue
,
current_user
)
close_resource_email
(
issue
,
current_user
,
'close_issue_email'
)
close_resource_email
(
issue
,
current_user
,
'close
d
_issue_email'
)
end
# When we reassign an issue we should send next emails:
...
...
spec/services/notification_service_spec.rb
浏览文件 @
c04120c1
...
...
@@ -28,9 +28,20 @@ describe NotificationService do
end
describe
:new_issue
do
it
'should sent email to issue assignee'
do
Notify
.
should_receive
(
:new_issue_email
).
with
(
issue
.
id
)
notification
.
new_issue
(
issue
,
nil
)
it
do
should_email
(
issue
.
assignee_id
)
should_email
(
@u_watcher
.
id
)
should_not_email
(
@u_participating
.
id
)
should_not_email
(
@u_disabled
.
id
)
notification
.
new_issue
(
issue
,
@u_disabled
)
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:new_issue_email
).
with
(
user_id
,
issue
.
id
)
end
def
should_not_email
(
user_id
)
Notify
.
should_not_receive
(
:new_issue_email
).
with
(
user_id
,
issue
.
id
)
end
end
...
...
@@ -65,11 +76,11 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:closed_issue_email
).
with
(
user_id
,
issue
.
id
,
issue
.
assignee_
id
)
Notify
.
should_receive
(
:closed_issue_email
).
with
(
user_id
,
issue
.
id
,
@u_disabled
.
id
)
end
def
should_not_email
(
user_id
)
Notify
.
should_not_receive
(
:closed_issue_email
).
with
(
user_id
,
issue
.
id
,
issue
.
assignee_
id
)
Notify
.
should_not_receive
(
:closed_issue_email
).
with
(
user_id
,
issue
.
id
,
@u_disabled
.
id
)
end
end
end
...
...
@@ -91,11 +102,11 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:new_merge_request_email
).
with
(
merge_request
.
id
)
Notify
.
should_receive
(
:new_merge_request_email
).
with
(
user_id
,
merge_request
.
id
)
end
def
should_not_email
(
user_id
)
Notify
.
should_not_receive
(
:new_merge_request_email
).
with
(
merge_request
.
id
)
Notify
.
should_not_receive
(
:new_merge_request_email
).
with
(
user_id
,
merge_request
.
id
)
end
end
...
...
@@ -127,11 +138,11 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:closed_merge_request_email
).
with
(
user_id
,
merge_request
.
id
)
Notify
.
should_receive
(
:closed_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
@u_disabled
.
id
)
end
def
should_not_email
(
user_id
)
Notify
.
should_not_receive
(
:closed_merge_request_email
).
with
(
user_id
,
merge_request
.
id
)
Notify
.
should_not_receive
(
:closed_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
@u_disabled
.
id
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录