Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f36e298c
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
f36e298c
编写于
3月 13, 2018
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #32231 from gmcgibbon/perform_email_jobs_in_assert_emails
Perform email jobs in #assert_emails
上级
bebce8c1
96218b45
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
6 deletion
+32
-6
actionmailer/CHANGELOG.md
actionmailer/CHANGELOG.md
+3
-1
actionmailer/lib/action_mailer/test_helper.rb
actionmailer/lib/action_mailer/test_helper.rb
+7
-5
actionmailer/test/test_helper_test.rb
actionmailer/test/test_helper_test.rb
+22
-0
未找到文件。
actionmailer/CHANGELOG.md
浏览文件 @
f36e298c
## Rails 6.0.0.alpha (Unreleased) ##
*
Perform email jobs in
`assert_emails`
.
*Gannon McGibbon*
*
Rails 6 requires Ruby 2.4.1 or newer.
...
...
actionmailer/lib/action_mailer/test_helper.rb
浏览文件 @
f36e298c
...
...
@@ -14,7 +14,7 @@ module TestHelper
# assert_emails 0
# ContactMailer.welcome.deliver_now
# assert_emails 1
# ContactMailer.welcome.deliver_
now
# ContactMailer.welcome.deliver_
later
# assert_emails 2
# end
#
...
...
@@ -28,17 +28,19 @@ module TestHelper
#
# assert_emails 2 do
# ContactMailer.welcome.deliver_now
# ContactMailer.welcome.deliver_
now
# ContactMailer.welcome.deliver_
later
# end
# end
def
assert_emails
(
number
)
def
assert_emails
(
number
,
&
block
)
if
block_given?
original_count
=
ActionMailer
::
Base
.
deliveries
.
size
yield
perform_enqueued_jobs
(
only:
[
ActionMailer
::
DeliveryJob
,
ActionMailer
::
Parameterized
::
DeliveryJob
],
&
block
)
new_count
=
ActionMailer
::
Base
.
deliveries
.
size
assert_equal
number
,
new_count
-
original_count
,
"
#{
number
}
emails expected, but
#{
new_count
-
original_count
}
were sent"
else
assert_equal
number
,
ActionMailer
::
Base
.
deliveries
.
size
perform_enqueued_jobs
(
only:
[
ActionMailer
::
DeliveryJob
,
ActionMailer
::
Parameterized
::
DeliveryJob
])
do
assert_equal
number
,
ActionMailer
::
Base
.
deliveries
.
size
end
end
end
...
...
actionmailer/test/test_helper_test.rb
浏览文件 @
f36e298c
...
...
@@ -69,6 +69,16 @@ def test_assert_emails
end
end
def
test_assert_emails_with_enqueued_emails
assert_nothing_raised
do
assert_emails
1
do
silence_stream
(
$stdout
)
do
TestHelperMailer
.
test
.
deliver_later
end
end
end
end
def
test_repeated_assert_emails_calls
assert_nothing_raised
do
assert_emails
1
do
...
...
@@ -105,6 +115,18 @@ def test_assert_no_emails
end
end
def
test_assert_no_emails_with_enqueued_emails
error
=
assert_raise
ActiveSupport
::
TestCase
::
Assertion
do
assert_no_emails
do
silence_stream
(
$stdout
)
do
TestHelperMailer
.
test
.
deliver_later
end
end
end
assert_match
(
/0 .* but 1/
,
error
.
message
)
end
def
test_assert_emails_too_few_sent
error
=
assert_raise
ActiveSupport
::
TestCase
::
Assertion
do
assert_emails
2
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录