Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5443021a
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,发现更多精彩内容 >>
提交
5443021a
编写于
8月 06, 2012
作者:
R
Riyad Preukschas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update notifications mails and notify specs for GFM
上级
9a0b763e
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
34 addition
and
35 deletion
+34
-35
app/mailers/notify.rb
app/mailers/notify.rb
+10
-9
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+2
-3
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+2
-2
app/views/notify/note_commit_email.html.haml
app/views/notify/note_commit_email.html.haml
+2
-2
app/views/notify/note_issue_email.html.haml
app/views/notify/note_issue_email.html.haml
+2
-4
app/views/notify/note_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
+2
-2
app/views/notify/note_wiki_email.html.haml
app/views/notify/note_wiki_email.html.haml
+2
-3
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+2
-2
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+2
-2
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+8
-6
未找到文件。
app/mailers/notify.rb
浏览文件 @
5443021a
...
@@ -17,22 +17,23 @@ class Notify < ActionMailer::Base
...
@@ -17,22 +17,23 @@ class Notify < ActionMailer::Base
def
new_issue_email
(
issue_id
)
def
new_issue_email
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@project
=
@issue
.
project
@project
=
@issue
.
project
mail
(
:to
=>
@issue
.
assignee_email
,
:subject
=>
"gitlab |
New Issue was created
"
)
mail
(
:to
=>
@issue
.
assignee_email
,
:subject
=>
"gitlab |
new issue #
#{
@issue
.
id
}
|
#{
@issue
.
title
}
|
#{
@project
.
name
}
"
)
end
end
def
note_wall_email
(
recipient_id
,
note_id
)
def
note_wall_email
(
recipient_id
,
note_id
)
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
#{
@
note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
#{
@
project
.
name
}
"
)
end
end
def
note_commit_email
(
recipient_id
,
note_id
)
def
note_commit_email
(
recipient_id
,
note_id
)
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@commit
=
@note
.
target
@commit
=
@note
.
target
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for commit
|
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for commit
#{
@commit
.
short_id
}
|
#{
@commit
.
title
}
|
#{
@project
.
name
}
"
)
end
end
def
note_merge_request_email
(
recipient_id
,
note_id
)
def
note_merge_request_email
(
recipient_id
,
note_id
)
...
@@ -40,7 +41,7 @@ class Notify < ActionMailer::Base
...
@@ -40,7 +41,7 @@ class Notify < ActionMailer::Base
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@merge_request
=
@note
.
noteable
@merge_request
=
@note
.
noteable
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for merge request
|
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for merge request
!
#{
@merge_request
.
id
}
|
#{
@project
.
name
}
"
)
end
end
def
note_issue_email
(
recipient_id
,
note_id
)
def
note_issue_email
(
recipient_id
,
note_id
)
...
@@ -48,7 +49,7 @@ class Notify < ActionMailer::Base
...
@@ -48,7 +49,7 @@ class Notify < ActionMailer::Base
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@issue
=
@note
.
noteable
@issue
=
@note
.
noteable
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for issue
#
{
@issue
.
id
}
|
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for issue #
#{
@issue
.
id
}
|
#{
@project
.
name
}
"
)
end
end
def
note_wiki_email
(
recipient_id
,
note_id
)
def
note_wiki_email
(
recipient_id
,
note_id
)
...
@@ -56,13 +57,13 @@ class Notify < ActionMailer::Base
...
@@ -56,13 +57,13 @@ class Notify < ActionMailer::Base
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@wiki
=
@note
.
noteable
@wiki
=
@note
.
noteable
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for wiki |
#{
@
note
.
project_
name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for wiki |
#{
@
project
.
name
}
"
)
end
end
def
new_merge_request_email
(
merge_request_id
)
def
new_merge_request_email
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@project
=
@merge_request
.
project
@project
=
@merge_request
.
project
mail
(
:to
=>
@merge_request
.
assignee_email
,
:subject
=>
"gitlab | new merge request
|
#{
@merge_request
.
title
}
"
)
mail
(
:to
=>
@merge_request
.
assignee_email
,
:subject
=>
"gitlab | new merge request
!
#{
@merge_request
.
id
}
|
#{
@merge_request
.
title
}
|
#{
@project
.
name
}
"
)
end
end
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
)
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
)
...
@@ -70,7 +71,7 @@ class Notify < ActionMailer::Base
...
@@ -70,7 +71,7 @@ class Notify < ActionMailer::Base
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@project
=
@merge_request
.
project
@project
=
@merge_request
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
merge request changed |
#{
@merge_request
.
title
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
changed merge request !
#{
@merge_request
.
id
}
|
#{
@merge_request
.
title
}
|
#{
@project
.
name
}
"
)
end
end
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
)
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
)
...
@@ -78,6 +79,6 @@ class Notify < ActionMailer::Base
...
@@ -78,6 +79,6 @@ class Notify < ActionMailer::Base
@issue
=
Issue
.
find
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@project
=
@issue
.
project
@project
=
@issue
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | changed issue
|
#{
@issue
.
title
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | changed issue
#
#{
@issue
.
id
}
|
#{
@issue
.
title
}
|
#{
@project
.
name
}
"
)
end
end
end
end
app/views/notify/new_issue_email.html.haml
浏览文件 @
5443021a
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
link_to
project_issue_url
(
@issue
.
project
,
@issue
),
:title
=>
@issue
.
title
do
=
"Issue #
#{
@issue
.
id
}
"
=
"Issue #
#{
@issue
.
id
.
to_s
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
:length
=>
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
:title
=>
@issue
.
title
=
truncate
(
@issue
.
title
,
:length
=>
45
)
%br
%br
app/views/notify/new_merge_request_email.html.haml
浏览文件 @
5443021a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
New Merge Request
=
"New Merge Request !
#{
@merge_request
.
id
}
"
=
link_to
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
=
link_to
_gfm
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/note_commit_email.html.haml
浏览文件 @
5443021a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
New comment for commit
=
"New comment for Commit
#{
@commit
.
short_id
}
"
=
link_to
truncate
(
@commit
.
id
.
to_s
,
:length
=>
16
),
project_commit_url
(
@note
.
project
,
:id
=>
@commit
.
id
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
=
link_to
_gfm
truncate
(
@commit
.
title
,
:length
=>
16
),
project_commit_url
(
@note
.
project
,
:id
=>
@commit
.
id
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/note_issue_email.html.haml
浏览文件 @
5443021a
...
@@ -4,10 +4,8 @@
...
@@ -4,10 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
New comment -
=
"New comment for Issue #
#{
@issue
.
id
}
"
=
link_to
project_issue_url
(
@issue
.
project
,
@issue
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
do
=
link_to_gfm
truncate
(
@issue
.
title
,
:length
=>
35
),
project_issue_url
(
@issue
.
project
,
@issue
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
=
"Issue #
#{
@issue
.
id
.
to_s
}
"
=
truncate
(
@issue
.
title
,
:length
=>
35
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/note_merge_request_email.html.haml
浏览文件 @
5443021a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
New comment for Merge Request
=
"New comment for Merge Request !
#{
@merge_request
.
id
}
"
=
link_to
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
=
link_to
_gfm
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/note_wiki_email.html.haml
浏览文件 @
5443021a
...
@@ -4,9 +4,8 @@
...
@@ -4,9 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
New comment -
New comment for Wiki page
=
link_to
project_issue_url
(
@wiki
.
project
,
@wiki
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
do
=
link_to_gfm
@wiki
.
title
,
project_issue_url
(
@wiki
.
project
,
@wiki
,
:anchor
=>
"note_
#{
@note
.
id
}
"
)
=
"Wiki #
#{
@wiki
.
title
.
to_s
}
"
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/reassigned_issue_email.html.haml
浏览文件 @
5443021a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
Reassigned Issue
=
"Reassigned Issue #
#{
@issue
.
id
}
"
=
link_to
truncate
(
@issue
.
title
,
:length
=>
16
),
project_issue_url
(
@issue
.
project
,
@issue
)
=
link_to
_gfm
truncate
(
@issue
.
title
,
:length
=>
16
),
project_issue_url
(
@issue
.
project
,
@issue
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
app/views/notify/reassigned_merge_request_email.html.haml
浏览文件 @
5443021a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%td
{
:align
=>
"left"
,
:style
=>
"padding: 20px 0 0;"
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%h2
{
:style
=>
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
Reassigned Merge Request
=
"Reassigned Merge Request !
#{
@merge_request
.
id
}
"
=
link_to
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
=
link_to
_gfm
truncate
(
@merge_request
.
title
,
:length
=>
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%tr
%tr
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
...
...
spec/mailers/notify_spec.rb
浏览文件 @
5443021a
...
@@ -60,7 +60,7 @@ describe Notify do
...
@@ -60,7 +60,7 @@ describe Notify do
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/
New Issue was created
/
should
have_subject
/
new issue #
#{
issue
.
id
}
/
end
end
it
'contains a link to the new issue'
do
it
'contains a link to the new issue'
do
...
@@ -102,7 +102,7 @@ describe Notify do
...
@@ -102,7 +102,7 @@ describe Notify do
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/new merge request/
should
have_subject
/new merge request
!
#{
merge_request
.
id
}
/
end
end
it
'contains a link to the new merge request'
do
it
'contains a link to the new merge request'
do
...
@@ -126,7 +126,7 @@ describe Notify do
...
@@ -126,7 +126,7 @@ describe Notify do
it_behaves_like
'a multiple recipients email'
it_behaves_like
'a multiple recipients email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/
merge request changed
/
should
have_subject
/
changed merge request !
#{
merge_request
.
id
}
/
end
end
it
'contains the name of the previous assignee'
do
it
'contains the name of the previous assignee'
do
...
@@ -188,6 +188,8 @@ describe Notify do
...
@@ -188,6 +188,8 @@ describe Notify do
mock
(
:commit
).
tap
do
|
commit
|
mock
(
:commit
).
tap
do
|
commit
|
commit
.
stub
(
:id
).
and_return
(
'fauxsha1'
)
commit
.
stub
(
:id
).
and_return
(
'fauxsha1'
)
commit
.
stub
(
:project
).
and_return
(
project
)
commit
.
stub
(
:project
).
and_return
(
project
)
commit
.
stub
(
:short_id
).
and_return
(
'fauxsha1'
)
commit
.
stub
(
:safe_message
).
and_return
(
'some message'
)
end
end
end
end
before
(
:each
)
{
note
.
stub
(
:target
).
and_return
(
commit
)
}
before
(
:each
)
{
note
.
stub
(
:target
).
and_return
(
commit
)
}
...
@@ -197,7 +199,7 @@ describe Notify do
...
@@ -197,7 +199,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/note for commit/
should
have_subject
/note for commit
#{
commit
.
short_id
}
/
end
end
it
'contains a link to the commit'
do
it
'contains a link to the commit'
do
...
@@ -215,7 +217,7 @@ describe Notify do
...
@@ -215,7 +217,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/note for merge request/
should
have_subject
/note for merge request
!
#{
merge_request
.
id
}
/
end
end
it
'contains a link to the merge request note'
do
it
'contains a link to the merge request note'
do
...
@@ -233,7 +235,7 @@ describe Notify do
...
@@ -233,7 +235,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it
'has the correct subject'
do
it
'has the correct subject'
do
should
have_subject
/note for issue
#{
issue
.
id
}
/
should
have_subject
/note for issue #
#
{
issue
.
id
}
/
end
end
it
'contains a link to the issue note'
do
it
'contains a link to the issue note'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录