Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1dff1068
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1dff1068
编写于
3月 10, 2009
作者:
S
Sean Dague
提交者:
Pratik Naik
3月 10, 2009
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow custom type for multipart emails [#1691 state:resolved]
Signed-off-by:
N
Pratik Naik
<
pratiknaik@gmail.com
>
上级
e8b07dc3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
2 deletion
+30
-2
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+1
-1
actionmailer/test/mail_layout_test.rb
actionmailer/test/mail_layout_test.rb
+29
-1
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
1dff1068
...
...
@@ -479,7 +479,7 @@ def create!(method_name, *parameters) #:nodoc:
)
end
unless
@parts
.
empty?
@content_type
=
"multipart/alternative"
@content_type
=
"multipart/alternative"
if
@content_type
!~
/^multipart/
@parts
=
sort_parts
(
@parts
,
@implicit_parts_order
)
end
end
...
...
actionmailer/test/mail_layout_test.rb
浏览文件 @
1dff1068
...
...
@@ -21,10 +21,12 @@ def nolayout(recipient)
body
render
(
:inline
=>
"Hello, <%= @world %>"
,
:layout
=>
false
,
:body
=>
{
:world
=>
"Earth"
})
end
def
multipart
(
recipient
)
def
multipart
(
recipient
,
type
=
nil
)
recipients
recipient
subject
"You have a mail"
from
"tester@example.com"
content_type
(
type
)
if
type
end
end
...
...
@@ -64,6 +66,19 @@ def test_should_pickup_default_layout
def
test_should_pickup_multipart_layout
mail
=
AutoLayoutMailer
.
create_multipart
(
@recipient
)
assert_equal
"multipart/alternative"
,
mail
.
content_type
assert_equal
2
,
mail
.
parts
.
size
assert_equal
'text/plain'
,
mail
.
parts
.
first
.
content_type
assert_equal
"text/plain layout - text/plain multipart"
,
mail
.
parts
.
first
.
body
assert_equal
'text/html'
,
mail
.
parts
.
last
.
content_type
assert_equal
"Hello from layout text/html multipart"
,
mail
.
parts
.
last
.
body
end
def
test_should_pickup_multipartmixed_layout
mail
=
AutoLayoutMailer
.
create_multipart
(
@recipient
,
"multipart/mixed"
)
assert_equal
"multipart/mixed"
,
mail
.
content_type
assert_equal
2
,
mail
.
parts
.
size
assert_equal
'text/plain'
,
mail
.
parts
.
first
.
content_type
...
...
@@ -73,6 +88,19 @@ def test_should_pickup_multipart_layout
assert_equal
"Hello from layout text/html multipart"
,
mail
.
parts
.
last
.
body
end
def
test_should_fix_multipart_layout
mail
=
AutoLayoutMailer
.
create_multipart
(
@recipient
,
"text/plain"
)
assert_equal
"multipart/alternative"
,
mail
.
content_type
assert_equal
2
,
mail
.
parts
.
size
assert_equal
'text/plain'
,
mail
.
parts
.
first
.
content_type
assert_equal
"text/plain layout - text/plain multipart"
,
mail
.
parts
.
first
.
body
assert_equal
'text/html'
,
mail
.
parts
.
last
.
content_type
assert_equal
"Hello from layout text/html multipart"
,
mail
.
parts
.
last
.
body
end
def
test_should_pickup_layout_given_to_render
mail
=
AutoLayoutMailer
.
create_spam
(
@recipient
)
assert_equal
"Spammer layout Hello, Earth"
,
mail
.
body
.
strip
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录