TestCase does not need to be loaded when loading the framework

(cherry picked from commit 8b35a239fb2dd9bfeed7f99f10e826a82dfb59da)

2 files changed, 12 insertions, 2 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index c24109a547..56da30997f 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -38,7 +38,6 @@ module ActionView
     autoload :LookupContext
     autoload :PathSet
     autoload :Template
-    autoload :TestCase
 
     autoload_under "renderer" do
       autoload :Renderer
@@ -75,6 +74,8 @@ module ActionView
     end
   end
 
+  autoload :TestCase
+
   ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
 end
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 626dd64ea6..5c7e474383 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -125,6 +125,15 @@ module ApplicationTests
       assert AppTemplate::Application.config.allow_concurrency
     end
 
+    test "initialize a threadsafe app" do
+      add_to_config <<-RUBY
+        config.threadsafe!
+      RUBY
+
+      require "#{app_path}/config/application"
+      assert AppTemplate::Application.initialize!
+    end
+
     test "asset_path defaults to nil for application" do
       require "#{app_path}/config/environment"
       assert_equal nil, AppTemplate::Application.config.asset_path
@@ -156,7 +165,7 @@ module ApplicationTests
 
       require "#{app_path}/config/environment"
 
-      assert !ActionController.autoload?(:RecordIdentifier)
+      assert !ActionView.autoload?(:AssetPaths)
     end
 
     test "filter_parameters should be able to set via config.filter_parameters" do