1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #24086 from yui-knk/do_not_ad_integration_test_class

Prevent not-intended loading of `ActionDispatch::IntegrationTest`
This commit is contained in:
Yves Senn 2016-03-07 09:10:29 +01:00
commit ab7ad20125
3 changed files with 9 additions and 2 deletions

View file

@ -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

View file

@ -1,3 +1,8 @@
* Add `action_dispatch_integration_test` load hook. The hook can be used to
extend `ActionDispatch::IntegrationTest` once it has been loaded.
*Yuichiro Kaneko*
* Update default rendering policies when the controller action did
not explicitly indicate a response.

View file

@ -764,5 +764,7 @@ module ActionDispatch
def self.register_encoder(*args)
Integration::Session::RequestEncoder.register_encoder(*args)
end
ActiveSupport.run_load_hooks(:action_dispatch_integration_test, self)
end
end