diff options
| author | Yves Senn <yves.senn@gmail.com> | 2016-03-07 09:10:29 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2016-03-07 09:12:18 +0100 |
| commit | ab7ad20125c0e0a199100fc12c2b7d67d90a6308 (patch) | |
| tree | dca7c942cc730047d25609e33456c0ad0af05bf1 /actionmailer/lib | |
| parent | cf1d45bd89309c952840bcd918af2b18bc55579c (diff) | |
| parent | 9a642931fbcc4bab0edffe41d3e7bf59e250e90e (diff) | |
| download | rails-ab7ad20125c0e0a199100fc12c2b7d67d90a6308.tar.gz rails-ab7ad20125c0e0a199100fc12c2b7d67d90a6308.tar.bz2 rails-ab7ad20125c0e0a199100fc12c2b7d67d90a6308.zip | |
Merge pull request #24086 from yui-knk/do_not_ad_integration_test_class
Prevent not-intended loading of `ActionDispatch::IntegrationTest`
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 215d0199af..a727ed38e9 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -45,9 +45,9 @@ module ActionMailer register_observers(options.delete(:observers)) options.each { |k,v| send("#{k}=", v) } - - ActionDispatch::IntegrationTest.send :include, ActionMailer::TestCase::ClearTestDeliveries end + + ActiveSupport.on_load(:action_dispatch_integration_test) { include ActionMailer::TestCase::ClearTestDeliveries } end initializer "action_mailer.compile_config_methods" do |