Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
b786f065
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,发现更多精彩内容 >>
提交
b786f065
编写于
9月 29, 2012
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not render views when mail() isn't called. (NullMail refactoring)
上级
2e44dda2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
1 deletion
+28
-1
actionmailer/CHANGELOG.md
actionmailer/CHANGELOG.md
+5
-0
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+13
-1
actionmailer/test/base_test.rb
actionmailer/test/base_test.rb
+6
-0
actionmailer/test/fixtures/base_mailer/without_mail_call.erb
actionmailer/test/fixtures/base_mailer/without_mail_call.erb
+1
-0
actionmailer/test/mailers/base_mailer.rb
actionmailer/test/mailers/base_mailer.rb
+3
-0
未找到文件。
actionmailer/CHANGELOG.md
浏览文件 @
b786f065
## Rails 4.0.0 (unreleased) ##
*
Do not render views when mail() isn't called.
Fix #7761
*Yves Senn*
*
Support
`Mailer.deliver_foo(*args)`
as a synonym for
`Mailer.foo(*args).deliver`
. This makes it easy to write e.g.
`Mailer.expects(:deliver_foo)`
when testing code that calls
...
...
actionmailer/lib/action_mailer/base.rb
浏览文件 @
b786f065
...
...
@@ -510,7 +510,19 @@ def initialize(method_name=nil, *args)
def
process
(
*
args
)
#:nodoc:
lookup_context
.
skip_default_locale!
super
generated_mail
=
super
unless
generated_mail
@_message
=
NullMail
.
new
end
end
class
NullMail
#:nodoc:
def
body
;
''
end
def
method_missing
(
*
args
)
nil
end
end
def
mailer_name
...
...
actionmailer/test/base_test.rb
浏览文件 @
b786f065
...
...
@@ -499,6 +499,12 @@ def teardown
end
end
test
'the view is not rendered when mail was never called'
do
mail
=
BaseMailer
.
without_mail_call
assert_equal
(
''
,
mail
.
body
.
to_s
.
strip
)
mail
.
deliver
end
# Before and After hooks
class
MyObserver
...
...
actionmailer/test/fixtures/base_mailer/without_mail_call.erb
0 → 100644
浏览文件 @
b786f065
<%
raise
'the template should not be rendered'
%>
\ No newline at end of file
actionmailer/test/mailers/base_mailer.rb
浏览文件 @
b786f065
...
...
@@ -115,4 +115,7 @@ def different_layout(layout_name='')
def
email_with_translations
mail
body:
render
(
"email_with_translations"
,
formats:
[
:html
])
end
def
without_mail_call
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录