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 /actionpack | |
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 '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..cad7c7334f 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -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. 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 |