diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-04-09 11:45:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 11:45:14 +0200 |
| commit | 81555776d4006f3cd31ae49e6ab385ea3327f036 (patch) | |
| tree | b38daf9f074d390f6a5d3eb7e5270a46ea694315 /actionmailer | |
| parent | 3b5a6dfb18f33c373a89760c60d741f34206f23b (diff) | |
| parent | e4cf71bf7a8be80ad4624ae3d21f5646e21cfe21 (diff) | |
| download | rails-81555776d4006f3cd31ae49e6ab385ea3327f036.tar.gz rails-81555776d4006f3cd31ae49e6ab385ea3327f036.tar.bz2 rails-81555776d4006f3cd31ae49e6ab385ea3327f036.zip | |
Merge pull request #28697 from y-yagi/remove_duplicated_delivery_method_definition
Remove duplicated `delivery_method` definition
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/parameterized_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionmailer/test/parameterized_test.rb b/actionmailer/test/parameterized_test.rb index 914ed12312..e988fffcb9 100644 --- a/actionmailer/test/parameterized_test.rb +++ b/actionmailer/test/parameterized_test.rb @@ -14,7 +14,6 @@ class ParameterizedTest < ActiveSupport::TestCase @previous_deliver_later_queue_name = ActionMailer::Base.deliver_later_queue_name ActionMailer::Base.deliver_later_queue_name = :test_queue - ActionMailer::Base.delivery_method = :test @mail = ParamsMailer.with(inviter: "david@basecamp.com", invitee: "jason@basecamp.com").invitation end |