3 files changed, 14 insertions, 6 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9e9702efb6..adec9533a9 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -2,6 +2,7 @@
 require 'isolation/abstract_unit'
 require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
+require 'yaml'
 
 module ApplicationTests
   class AssetsTest < Test::Unit::TestCase
diff --git a/railties/test/application/initializers/active_record_test.rb b/railties/test/application/initializers/active_record_test.rb
index edf78a8a0a..b62943a278 100644
--- a/railties/test/application/initializers/active_record_test.rb
+++ b/railties/test/application/initializers/active_record_test.rb
@@ -23,10 +23,17 @@ module ApplicationTests
       boot_rails
       simple_controller
 
-      get '/foo'
-      assert last_response.body.include?("We're sorry, but something went wrong (500)")
+      # ActiveSupport::LogSubscriber.flush_all! in lib/rails/rack/logger.rb blew up in Ruby 2.0
+      # because it tries to open the database. This behavior doesn't happen in Ruby 1.9.3.
+      # However, regardless, the server blew up.
+      if RUBY_VERSION >= '2.0.0'
+        assert_raises (Errno::ENOENT) { get '/foo' }
+      else
+        get '/foo'
+        assert last_response.body.include?("We're sorry, but something went wrong (500)")
+      end
     end
-    
+
     test "uses DATABASE_URL env var when config/database.yml doesn't exist" do
       database_path = "/db/foo.sqlite3"
       FileUtils.rm_rf("#{app_path}/config/database.yml")
@@ -35,7 +42,7 @@ module ApplicationTests
 
       get '/foo'
       assert_equal 'foo', last_response.body
-      
+
       # clean up
       FileUtils.rm("#{app_path}/#{database_path}")
     end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 5c920cb33a..dea0ee71c9 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -18,7 +18,7 @@ module ApplicationTests
 
     def test_displaying_routes_for_engines
       engine = Class.new(Rails::Engine) do
-        def self.to_s
+        def self.inspect
           "Blog::Engine"
         end
       end
@@ -136,7 +136,7 @@ module ApplicationTests
 
     def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
       constraint = Class.new do
-        def to_s
+        def inspect
           "( my custom constraint )"
         end
       end