Merge commit 'mainstream/master'

1 files changed, 0 insertions, 43 deletions

diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb
deleted file mode 100644
index 1437e6d885..0000000000
--- a/railties/test/console_app_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'abstract_unit'
-
-require 'action_controller' # console_app uses 'action_controller/integration'
-
-require 'rails/dispatcher'
-require 'rails/console_app'
-
-module Rails
-  def self.application
-    ActionController::Routing::Routes
-  end
-end
-
-# console_app sets Test::Unit.run to work around the at_exit hook in test/unit, which kills IRB
-if Test::Unit.respond_to?(:run=)
-  Test::Unit.run = false
-
-  class ConsoleAppTest < Test::Unit::TestCase
-    def test_app_method_should_return_integration_session
-      assert_nothing_thrown do
-        console_session = app
-        assert_not_nil console_session
-        assert_instance_of ActionController::Integration::Session,
-          console_session
-      end
-    end
-
-    def test_reload_should_fire_preparation_callbacks
-      a = b = c = nil
-
-      ActionDispatch::Callbacks.to_prepare { a = b = c = 1 }
-      ActionDispatch::Callbacks.to_prepare { b = c = 2 }
-      ActionDispatch::Callbacks.to_prepare { c = 3 }
-      ActionController::Routing::Routes.expects(:reload)
-
-      reload!
-
-      assert_equal 1, a
-      assert_equal 2, b
-      assert_equal 3, c
-    end
-  end
-end