aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-04-17 15:21:43 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-04-17 15:21:43 -0700
commit5154701e204b1c71c2b44d7b9f931dbe468f8030 (patch)
tree4468a0892c34bcd4784c1534d765d8c548d064f1 /railties
parent2c8e0bba4b5122aec03299c1f3726be8343ca3c0 (diff)
parent26861302c936e336771ebf8e66754b5b0c9344de (diff)
downloadrails-5154701e204b1c71c2b44d7b9f931dbe468f8030.tar.gz
rails-5154701e204b1c71c2b44d7b9f931dbe468f8030.tar.bz2
rails-5154701e204b1c71c2b44d7b9f931dbe468f8030.zip
Merge pull request #24551 from bogdanvlviv/notice_for_tasks
Added notice when a database is successfully created or dropped.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/bin_setup_test.rb2
-rw-r--r--railties/test/application/rake/dbs_test.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index a07c51a60f..ba700df1d6 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -43,6 +43,8 @@ module ApplicationTests
The Gemfile's dependencies are satisfied
== Preparing database ==
+Created database 'db/development.sqlite3'
+Created database 'db/test.sqlite3'
== Removing old logs and tempfiles ==
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index a229609e84..a6c69fbd54 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -29,11 +29,11 @@ module ApplicationTests
def db_create_and_drop(expected_database)
Dir.chdir(app_path) do
output = `bin/rails db:create`
- assert_empty output
+ assert_match /Created database/, output
assert File.exist?(expected_database)
assert_equal expected_database, ActiveRecord::Base.connection_config[:database]
output = `bin/rails db:drop`
- assert_empty output
+ assert_match /Dropped database/, output
assert !File.exist?(expected_database)
end
end