Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
602cc1c5
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 搜索 >>
未验证
提交
602cc1c5
编写于
8月 26, 2020
作者:
R
Rafael França
提交者:
GitHub
8月 26, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #39277 from Edouard-chin/ec-delivery-job-deprecation
Deprecate custom Action Mailer delivery job:
上级
3ddf6b66
859f3bf0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
69 addition
and
1 deletion
+69
-1
actionmailer/lib/action_mailer/message_delivery.rb
actionmailer/lib/action_mailer/message_delivery.rb
+24
-1
actionmailer/test/legacy_delivery_job_test.rb
actionmailer/test/legacy_delivery_job_test.rb
+45
-0
未找到文件。
actionmailer/lib/action_mailer/message_delivery.rb
浏览文件 @
602cc1c5
...
...
@@ -142,14 +142,37 @@ def enqueue_delivery(delivery_method, options = {})
else
job
=
@mailer_class
.
delivery_job
if
job
<=
MailDeliveryJob
if
use_new_args?
(
job
)
job
.
set
(
options
).
perform_later
(
@mailer_class
.
name
,
@action
.
to_s
,
delivery_method
.
to_s
,
args:
@args
)
elsif
job
<=
DeliveryJob
job
.
set
(
options
).
perform_later
(
@mailer_class
.
name
,
@action
.
to_s
,
delivery_method
.
to_s
,
*
@args
)
else
ActiveSupport
::
Deprecation
.
warn
(
<<~
EOM
)
In Rails 6.2, Action Mailer will pass the mail arguments inside the `:args` keyword argument.
The `perform` method of the
#{
job
}
needs to change and forward the mail arguments
from the `args` keyword argument.
The `perform` method should now look like:
`def perform(mailer, mail_method, delivery, args:)`
EOM
job
.
set
(
options
).
perform_later
(
@mailer_class
.
name
,
@action
.
to_s
,
delivery_method
.
to_s
,
*
@args
)
end
end
end
def
use_new_args?
(
job
)
parameters
=
job
.
public_instance_method
(
:perform
).
parameters
parameters
.
find
do
|
key
,
name
|
return
true
if
key
==
:keyreq
&&
name
==
:args
key
==
:keyrest
end
end
end
end
actionmailer/test/legacy_delivery_job_test.rb
浏览文件 @
602cc1c5
...
...
@@ -11,6 +11,21 @@ class LegacyDeliveryJobTest < ActiveSupport::TestCase
class
LegacyDeliveryJob
<
ActionMailer
::
DeliveryJob
end
class
LegacyArgumentDeliveryJob
<
ActiveJob
::
Base
def
perform
(
mailer
,
mail_method
,
delivery_method
,
*
args
)
end
end
class
NewArgumentDeliveryJob
<
ActiveJob
::
Base
def
perform
(
mailer
,
mail_method
,
delivery_method
,
args
:)
end
end
class
KeyRestArgumentJob
<
ActiveJob
::
Base
def
perform
(
mailer
,
mail_method
,
delivery_method
,
**
kwargs
)
end
end
setup
do
@previous_logger
=
ActiveJob
::
Base
.
logger
ActiveJob
::
Base
.
logger
=
Logger
.
new
(
nil
)
...
...
@@ -68,6 +83,36 @@ class LegacyDeliveryJob < ActionMailer::DeliveryJob
end
end
test
"triggers a deprecation warning when a delivery job use legacy arguments"
do
with_delivery_job
(
LegacyArgumentDeliveryJob
)
do
assert_deprecated
(
"Action Mailer will pass the mail arguments inside the `:args` keyword argument"
)
do
perform_enqueued_jobs
do
DelayedMailer
.
test_message
(
1
,
2
,
3
).
deliver_later
end
end
end
end
test
"does not trigger a deprecation warning when a delivery job use a required `args` kwargs"
do
with_delivery_job
(
NewArgumentDeliveryJob
)
do
assert_not_deprecated
do
perform_enqueued_jobs
do
DelayedMailer
.
test_message
(
1
,
2
,
3
).
deliver_later
end
end
end
end
test
"does not trigger a deprecation warning when a delivery job use a keyrest argument"
do
with_delivery_job
(
KeyRestArgumentJob
)
do
assert_not_deprecated
do
perform_enqueued_jobs
do
DelayedMailer
.
test_message
(
1
,
2
,
3
).
deliver_later
end
end
end
end
private
def
with_delivery_job
(
job
)
old_params_delivery_job
=
ParamsMailer
.
delivery_job
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录