aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2016-03-07 09:10:29 +0100
committerYves Senn <yves.senn@gmail.com>2016-03-07 09:12:18 +0100
commitab7ad20125c0e0a199100fc12c2b7d67d90a6308 (patch)
treedca7c942cc730047d25609e33456c0ad0af05bf1 /actionpack/lib
parentcf1d45bd89309c952840bcd918af2b18bc55579c (diff)
parent9a642931fbcc4bab0edffe41d3e7bf59e250e90e (diff)
downloadrails-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/lib')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
1 files changed, 2 insertions, 0 deletions
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