diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-11-11 20:05:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 20:05:10 +0000 |
| commit | 6b830dc930a5d684c05b028757b06834df4d064d (patch) | |
| tree | cce822e4496b50a6bd5b121a540447f59f59e3e4 /railties/test/application/initializers/active_record_test.rb | |
| parent | e4b0a5f66ebd2b7f29e4f868d2f6b2504df091e6 (diff) | |
| parent | 9b103311d5d266fa509f5da8825ea5daecba1836 (diff) | |
| download | rails-6b830dc930a5d684c05b028757b06834df4d064d.tar.gz rails-6b830dc930a5d684c05b028757b06834df4d064d.tar.bz2 rails-6b830dc930a5d684c05b028757b06834df4d064d.zip | |
Merge pull request #26962 from rails/fix-3-2-stable-on-ruby-2-3
Fix Rails 3-2-stable on Ruby 2.3.1
Diffstat (limited to 'railties/test/application/initializers/active_record_test.rb')
| -rw-r--r-- | railties/test/application/initializers/active_record_test.rb | 4 |
1 files changed, 2 insertions, 2 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' |