mirror of
https://github.com/heartcombo/devise.git
synced 2026-01-08 22:37:57 -05:00
ed1c2a1adb
Rails allow procs and lambda with either zero or more argument. Devise however always tried to call instance_eval on those values, which does always pass one argument: self. There was a PR to fix this specific problem in Devise https://github.com/heartcombo/devise/pull/4627, before the arity check was fixed in rails itself: https://github.com/rails/rails/pull/30391. But even if the problem was fixed in Rails, Devise was still calling the proc/lambas with instance_eval. That meant the fix added to Rails did not apply to Devise. The fix is to let Rails handle the :from and :reply_to defaults. We do that by unsetting the headers instead of trying to replicate Rails handling in Devise. This lets Rails handle it when setting up the mailer.
47 lines
1.3 KiB
Ruby
47 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "test_helper"
|
|
|
|
class MailerTest < ActionMailer::TestCase
|
|
test "pass given block to #mail call" do
|
|
class TestMailer < Devise::Mailer
|
|
def confirmation_instructions(record, token, opts = {})
|
|
@token = token
|
|
devise_mail(record, :confirmation_instructions, opts) do |format|
|
|
format.html(content_transfer_encoding: "7bit")
|
|
end
|
|
end
|
|
end
|
|
|
|
mail = TestMailer.confirmation_instructions(create_user, "confirmation-token")
|
|
|
|
assert mail.content_transfer_encoding, "7bit"
|
|
end
|
|
|
|
test "default values defined as proc with different arity are handled correctly" do
|
|
class TestMailerWithDefault < Devise::Mailer
|
|
default from: -> { computed_from }
|
|
default reply_to: ->(_) { computed_reply_to }
|
|
|
|
def confirmation_instructions(record, token, opts = {})
|
|
@token = token
|
|
devise_mail(record, :confirmation_instructions, opts)
|
|
end
|
|
|
|
private
|
|
|
|
def computed_from
|
|
"from@example.com"
|
|
end
|
|
|
|
def computed_reply_to
|
|
"reply_to@example.com"
|
|
end
|
|
end
|
|
|
|
mail = TestMailerWithDefault.confirmation_instructions(create_user, "confirmation-token")
|
|
assert mail.from, "from@example.com"
|
|
assert mail.reply_to, "reply_to@example.com"
|
|
end
|
|
end
|