diff options
author | Matthew Draper <matthew@trebex.net> | 2017-10-10 07:13:16 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-10 07:13:16 +1030 |
commit | ac1ee519fa513f1c2188180e8830938c71edb48c (patch) | |
tree | 6ee41847b093222e8ba99f41574287dc27beec66 /railties/test/application/dbconsole_test.rb | |
parent | 1b36e2cc244d34f4f232ef5abecdf12731f5ccfd (diff) | |
parent | 2329207bec7642bc4b95c82b2bff997d5242b6eb (diff) | |
download | rails-ac1ee519fa513f1c2188180e8830938c71edb48c.tar.gz rails-ac1ee519fa513f1c2188180e8830938c71edb48c.tar.bz2 rails-ac1ee519fa513f1c2188180e8830938c71edb48c.zip |
Merge pull request #30595 from bogdanvlviv/use-railties-rails-command
Improve railties' tests
Diffstat (limited to 'railties/test/application/dbconsole_test.rb')
-rw-r--r-- | railties/test/application/dbconsole_test.rb | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/railties/test/application/dbconsole_test.rb b/railties/test/application/dbconsole_test.rb index ba04c81b4d..8eb293c179 100644 --- a/railties/test/application/dbconsole_test.rb +++ b/railties/test/application/dbconsole_test.rb @@ -19,21 +19,19 @@ module ApplicationTests end def test_use_value_defined_in_environment_file_in_database_yml - Dir.chdir(app_path) do - app_file "config/database.yml", <<-YAML - development: - database: <%= Rails.application.config.database %> - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - YAML + app_file "config/database.yml", <<-YAML + development: + database: <%= Rails.application.config.database %> + adapter: sqlite3 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + timeout: 5000 + YAML - app_file "config/environments/development.rb", <<-RUBY - Rails.application.configure do - config.database = "db/development.sqlite3" - end - RUBY - end + app_file "config/environments/development.rb", <<-RUBY + Rails.application.configure do + config.database = "db/development.sqlite3" + end + RUBY master, slave = PTY.open spawn_dbconsole(slave) @@ -43,22 +41,20 @@ module ApplicationTests end def test_respect_environment_option - Dir.chdir(app_path) do - app_file "config/database.yml", <<-YAML - default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 + app_file "config/database.yml", <<-YAML + default: &default + adapter: sqlite3 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + timeout: 5000 - development: - <<: *default - database: db/development.sqlite3 + development: + <<: *default + database: db/development.sqlite3 - production: - <<: *default - database: db/production.sqlite3 - YAML - end + production: + <<: *default + database: db/production.sqlite3 + YAML master, slave = PTY.open spawn_dbconsole(slave, "-e production") |