diff options
| author | schneems <richard.schneeman@gmail.com> | 2014-01-02 15:00:30 -0600 |
|---|---|---|
| committer | schneems <richard.schneeman@gmail.com> | 2014-01-02 15:00:30 -0600 |
| commit | f642b18c0e05359fe2b0098108741963e6b04328 (patch) | |
| tree | 0aacd6bb8bc859aff4c091449b27d729c9ea447a /railties/test/application/rake | |
| parent | 96288e83c1c7666f33f21c4fe48fd0cb9ad4ec8a (diff) | |
| download | rails-f642b18c0e05359fe2b0098108741963e6b04328.tar.gz rails-f642b18c0e05359fe2b0098108741963e6b04328.tar.bz2 rails-f642b18c0e05359fe2b0098108741963e6b04328.zip | |
Use DATABASE_URL by default
See https://github.com/rails/rails/pull/13463#issuecomment-31480799 for full conversation.
Diffstat (limited to 'railties/test/application/rake')
| -rw-r--r-- | railties/test/application/rake/dbs_test.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb index 66d3137df0..35d9c31c1e 100644 --- a/railties/test/application/rake/dbs_test.rb +++ b/railties/test/application/rake/dbs_test.rb @@ -21,16 +21,9 @@ module ApplicationTests end def set_database_url - ENV['RAILS_DATABASE_URL'] = File.join("sqlite3://:@localhost", database_url_db_name) + ENV['DATABASE_URL'] = File.join("sqlite3://:@localhost", database_url_db_name) # ensure it's using the DATABASE_URL FileUtils.rm_rf("#{app_path}/config/database.yml") - File.open("#{app_path}/config/database.yml", 'w') do |f| - yaml = <<-YAML.strip_heredoc - #{ENV['RAILS_ENV']}: - url: <%= ENV['RAILS_DATABASE_URL'] %> - YAML - f << yaml - end end def expected |