diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-12 19:19:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-12 19:19:17 -0400 |
commit | b79f3cc96bc917d3390105ebea83770dd2934d10 (patch) | |
tree | e00586bcfc48eebbbc54e1b9bba3a4954d265f6a /actionmailer/lib | |
parent | 792fead512be390fdaf219b8bf3e17aa335bd7f4 (diff) | |
parent | 64a9759aff949761f1d79b010e4817a91f3ee226 (diff) | |
download | rails-b79f3cc96bc917d3390105ebea83770dd2934d10.tar.gz rails-b79f3cc96bc917d3390105ebea83770dd2934d10.tar.bz2 rails-b79f3cc96bc917d3390105ebea83770dd2934d10.zip |
Merge pull request #33849 from ricardotk002/include-helpers-action-dispatch-integration-test
Include test helpers in ActionDispatch::IntegrationTest
Diffstat (limited to 'actionmailer/lib')
-rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 69578471b0..bb6141b406 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -49,7 +49,10 @@ module ActionMailer options.each { |k, v| send("#{k}=", v) } end - ActiveSupport.on_load(:action_dispatch_integration_test) { include ActionMailer::TestCase::ClearTestDeliveries } + ActiveSupport.on_load(:action_dispatch_integration_test) do + include ActionMailer::TestHelper + include ActionMailer::TestCase::ClearTestDeliveries + end end initializer "action_mailer.compile_config_methods" do |