diff options
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/initializers/active_record_test.rb | 4 | ||||
-rw-r--r-- | railties/test/application/routing_test.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/test/application/initializers/active_record_test.rb b/railties/test/application/initializers/active_record_test.rb index b62943a278..d823577a3d 100644 --- a/railties/test/application/initializers/active_record_test.rb +++ b/railties/test/application/initializers/active_record_test.rb @@ -25,8 +25,8 @@ module ApplicationTests # 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' + # However, regardless, the server blew up. This appears to be fixed in 2.3.0. + if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.3.0' assert_raises (Errno::ENOENT) { get '/foo' } else get '/foo' diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index 7d6033c54c..c0dba3ea3e 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -9,6 +9,8 @@ module ApplicationTests def setup build_app boot_rails + + sleep 1 end def teardown @@ -191,14 +193,14 @@ module ApplicationTests get '/foo' assert_equal 'bar', last_response.body + sleep 1 + app_file 'config/routes.rb', <<-RUBY AppTemplate::Application.routes.draw do match 'foo', :to => 'foo#baz' end RUBY - sleep 0.1 - get '/foo' assert_equal expected, last_response.body end |