1 files changed, 92 insertions, 14 deletions

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index a3e1916494..79dfacdcdb 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -4,9 +4,19 @@ module ApplicationTests
   class InitializerTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
 
+    def new_app
+      File.expand_path("#{app_path}/../new_app")
+    end
+
+    def copy_app
+      FileUtils.cp_r(app_path, new_app)
+    end
+
     def setup
+      FileUtils.rm_rf(new_app) if File.directory?(new_app)
       build_app
       boot_rails
+      FileUtils.rm_rf("#{app_path}/config/environments")
     end
 
     test "the application root is set correctly" do
@@ -14,35 +24,103 @@ module ApplicationTests
       assert_equal Pathname.new(app_path), Rails.application.root
     end
 
+    test "the application root can be seen from the application singleton" do
+      require "#{app_path}/config/environment"
+      assert_equal Pathname.new(app_path), AppTemplate::Application.root
+    end
+
     test "the application root can be set" do
-      FileUtils.mkdir_p("#{app_path}/hello")
+      copy_app
       add_to_config <<-RUBY
-        config.frameworks = []
-        config.root = '#{app_path}/hello'
+        config.root = '#{new_app}'
       RUBY
+
+      use_frameworks []
+
+      require "#{app_path}/config/environment"
+      assert_equal Pathname.new(new_app), Rails.application.root
+    end
+
+    test "the application root is Dir.pwd if there is no config.ru" do
+      File.delete("#{app_path}/config.ru")
+
+      use_frameworks []
+
+      Dir.chdir("#{app_path}") do
+        require "#{app_path}/config/environment"
+        assert_equal Pathname.new("#{app_path}"), Rails.application.root
+      end
+    end
+
+    test "if there's no config.active_support.bare, all of ActiveSupport is required" do
+      use_frameworks []
       require "#{app_path}/config/environment"
-      assert_equal Pathname.new("#{app_path}/hello"), Rails.application.root
+      assert_nothing_raised { [1,2,3].rand }
     end
 
-    test "the application root is detected as where config.ru is located" do
+    test "config.active_support.bare does not require all of ActiveSupport" do
+      add_to_config "config.active_support.bare = true"
+
+      use_frameworks []
+
+      Dir.chdir("#{app_path}/app") do
+        require "#{app_path}/config/environment"
+        assert_raises(NoMethodError) { [1,2,3].rand }
+      end
+    end
+
+    test "marking the application as threadsafe sets the correct config variables" do
       add_to_config <<-RUBY
-        config.frameworks = []
+        config.threadsafe!
       RUBY
-      FileUtils.mv "#{app_path}/config.ru", "#{app_path}/config/config.ru"
+
+      require "#{app_path}/config/application"
+      assert AppTemplate::Application.config.action_controller.allow_concurrency
+    end
+
+    test "the application can be marked as threadsafe when there are no frameworks" do
+      FileUtils.rm_rf("#{app_path}/config/environments")
+      add_to_config <<-RUBY
+        config.threadsafe!
+      RUBY
+
+      use_frameworks []
+
+      assert_nothing_raised do
+        require "#{app_path}/config/application"
+      end
+    end
+
+    test "Frameworks are not preloaded by default" do
       require "#{app_path}/config/environment"
-      assert_equal Pathname.new("#{app_path}/config"), Rails.application.root
+
+      assert ActionController.autoload?(:RecordIdentifier)
     end
 
-    test "the application root is Dir.pwd if there is no config.ru" do
-      File.delete("#{app_path}/config.ru")
+    test "frameworks are preloaded with config.preload_frameworks is set" do
       add_to_config <<-RUBY
-        config.frameworks = []
+        config.preload_frameworks = true
       RUBY
 
-      Dir.chdir("#{app_path}/app") do
+      require "#{app_path}/config/environment"
+
+      assert !ActionController.autoload?(:RecordIdentifier)
+    end
+
+    test "runtime error is raised if config.frameworks= is used" do
+      add_to_config "config.frameworks = []"
+
+      assert_raises RuntimeError do
+        require "#{app_path}/config/environment"
+      end
+    end
+
+    test "runtime error is raised if config.frameworks is used" do
+      add_to_config "config.frameworks -= []"
+
+      assert_raises RuntimeError do
         require "#{app_path}/config/environment"
-        assert_equal Pathname.new("#{app_path}/app"), Rails.application.root
       end
     end
   end
-end
\ No newline at end of file
+end