diff options
author | yui-knk <spiketeika@gmail.com> | 2016-03-07 11:52:51 +0900 |
---|---|---|
committer | yui-knk <spiketeika@gmail.com> | 2016-03-07 16:48:18 +0900 |
commit | 9a642931fbcc4bab0edffe41d3e7bf59e250e90e (patch) | |
tree | f5faac0c7e4d39a9ef0f22992e4de4961495c9ab /actionpack | |
parent | af80974f85f8ffb54e7aa2aea8e171f36c3a7ab3 (diff) | |
download | rails-9a642931fbcc4bab0edffe41d3e7bf59e250e90e.tar.gz rails-9a642931fbcc4bab0edffe41d3e7bf59e250e90e.tar.bz2 rails-9a642931fbcc4bab0edffe41d3e7bf59e250e90e.zip |
Prevent not-intended loading of `ActionDispatch::IntegrationTest`
After 9d378747326d26cf1afdac4433ead22967af0984 `ActionDispatch::IntegrationTest`
class is loaded and defined in all Rails environments, not only test but also
production. This is not-intended loading of a class which is only used in
test environment.
To prevent not-intended loading, add `ActiveSupport.run_load_hooks` to
`ActionDispatch::IntegrationTest` with `action_dispatch_integration_test` name
and use it in `ActionMailer`.
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 6b73b29ace..e510ecc5ea 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +* Add `ActiveSupport.run_load_hooks` to `ActionDispatch::IntegrationTest` + with `action_dispatch_integration_test` name. + + *Yuichiro Kaneko* + * Update default rendering policies when the controller action did not explicitly indicate a response. diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index f4534b4173..b0b5db704b 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -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 |