diff options
author | Prem Sichanugrist <s@sikac.hu> | 2013-02-21 20:21:24 -0500 |
---|---|---|
committer | Prem Sichanugrist <s@sikac.hu> | 2013-02-24 16:32:24 -0500 |
commit | b59b72a5aeb799ddaa43dc7ed8ef8101a6c95896 (patch) | |
tree | a3a0d83b27f0d056a6f19f3251b0d4f1ab5a3438 /railties/test | |
parent | 9a0cdc68b5b0fc08e60069cb5512bf2ad6b2a76b (diff) | |
download | rails-b59b72a5aeb799ddaa43dc7ed8ef8101a6c95896.tar.gz rails-b59b72a5aeb799ddaa43dc7ed8ef8101a6c95896.tar.bz2 rails-b59b72a5aeb799ddaa43dc7ed8ef8101a6c95896.zip |
Fix failing test case when no database.yml
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/initializers/active_record_test.rb | 15 |
1 files changed, 11 insertions, 4 deletions
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 |