Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5af7cab0
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,发现更多精彩内容 >>
提交
5af7cab0
编写于
2月 09, 2014
作者:
D
Dmitry Polushkin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add actionmailer test coverage for undefined delivery method
上级
ec435844
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
10 deletion
+21
-10
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+1
-1
actionmailer/test/delivery_methods_test.rb
actionmailer/test/delivery_methods_test.rb
+20
-9
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
5af7cab0
...
...
@@ -764,7 +764,7 @@ def mail(headers = {}, &block)
m
.
charset
=
charset
=
headers
[
:charset
]
# Set configure delivery behavior
wrap_delivery_behavior!
(
headers
.
delete
(
:delivery_method
),
headers
.
delete
(
:delivery_method_options
))
wrap_delivery_behavior!
(
headers
.
delete
(
:delivery_method
),
headers
.
delete
(
:delivery_method_options
))
# Assign all headers except parts_order, content_type and body
assignable
=
headers
.
except
(
:parts_order
,
:content_type
,
:body
,
:template_name
,
:template_path
)
...
...
actionmailer/test/delivery_methods_test.rb
浏览文件 @
5af7cab0
...
...
@@ -38,8 +38,10 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
end
test
"default sendmail settings"
do
settings
=
{
location:
'/usr/sbin/sendmail'
,
arguments:
'-i -t'
}
settings
=
{
location:
'/usr/sbin/sendmail'
,
arguments:
'-i -t'
}
assert_equal
settings
,
ActionMailer
::
Base
.
sendmail_settings
end
end
...
...
@@ -138,13 +140,15 @@ def teardown
end
test
"default delivery options can be overridden per mail instance"
do
settings
=
{
address:
"localhost"
,
port:
25
,
domain:
'localhost.localdomain'
,
user_name:
nil
,
password:
nil
,
authentication:
nil
,
enable_starttls_auto:
true
}
settings
=
{
address:
"localhost"
,
port:
25
,
domain:
'localhost.localdomain'
,
user_name:
nil
,
password:
nil
,
authentication:
nil
,
enable_starttls_auto:
true
}
assert_equal
settings
,
ActionMailer
::
Base
.
smtp_settings
overridden_options
=
{
user_name:
"overridden"
,
password:
"somethingobtuse"
}
mail_instance
=
DeliveryMailer
.
welcome
(
delivery_method_options:
overridden_options
)
...
...
@@ -164,6 +168,13 @@ def teardown
end
end
test
"undefined delivery methods raises errors"
do
DeliveryMailer
.
delivery_method
=
nil
assert_raise
RuntimeError
do
DeliveryMailer
.
welcome
.
deliver
end
end
test
"does not perform deliveries if requested"
do
DeliveryMailer
.
perform_deliveries
=
false
DeliveryMailer
.
deliveries
.
clear
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录