1 files changed, 19 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ece41f9de8..adb867ca6d 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -16,6 +16,7 @@ module ApplicationTests
       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
@@ -75,10 +76,11 @@ module ApplicationTests
     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.frameworks = []
         config.threadsafe!
       RUBY
 
+      use_frameworks []
+
       assert_nothing_raised do
         require "#{app_path}/config/application"
       end
@@ -99,5 +101,21 @@ module ApplicationTests
 
       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"
+      end
+    end
   end
 end