Merge pull request #24551 from bogdanvlviv/notice_for_tasks

Added notice when a database is successfully created or dropped.

4 files changed, 100 insertions, 10 deletions

diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 0aac5bad31..e6d731e1e1 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -8,6 +8,13 @@ module ActiveRecord
       ActiveRecord::Tasks::MySQLDatabaseTasks.stubs(:new).returns @mysql_tasks
       ActiveRecord::Tasks::PostgreSQLDatabaseTasks.stubs(:new).returns @postgresql_tasks
       ActiveRecord::Tasks::SQLiteDatabaseTasks.stubs(:new).returns @sqlite_tasks
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
   end
 
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 1632f04854..2541a97537 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -12,6 +12,13 @@ module ActiveRecord
 
       ActiveRecord::Base.stubs(:connection).returns(@connection)
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_establishes_connection_without_database
@@ -48,14 +55,20 @@ module ActiveRecord
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
     end
 
-    def test_create_when_database_exists_outputs_info_to_stderr
-      $stderr.expects(:puts).with("my-app-db already exists").once
+    def test_when_database_created_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
 
+      assert_equal $stdout.string, "Created database 'my-app-db'\n"
+    end
+
+    def test_create_when_database_exists_outputs_info_to_stderr
       ActiveRecord::Base.connection.stubs(:create_database).raises(
-        ActiveRecord::StatementInvalid.new("Can't create database 'dev'; database exists:")
+        ActiveRecord::Tasks::DatabaseAlreadyExists
       )
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
+
+      assert_equal $stderr.string, "Database 'my-app-db' already exists\n"
     end
   end
 
@@ -77,6 +90,13 @@ module ActiveRecord
       ActiveRecord::Base.stubs(:establish_connection).
         raises(@error).
         then.returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_root_password_is_requested
@@ -160,6 +180,13 @@ module ActiveRecord
 
       ActiveRecord::Base.stubs(:connection).returns(@connection)
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_establishes_connection_to_mysql_database
@@ -173,6 +200,12 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.drop @configuration
     end
+
+    def test_when_database_dropped_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+
+      assert_equal $stdout.string, "Dropped database 'my-app-db'\n"
+    end
   end
 
   class MySQLPurgeTest < ActiveRecord::TestCase
@@ -307,6 +340,5 @@ module ActiveRecord
       ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
     end
   end
-
 end
 end
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index ba53f340ae..353aecdda6 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -12,6 +12,13 @@ module ActiveRecord
 
       ActiveRecord::Base.stubs(:connection).returns(@connection)
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_establishes_connection_to_postgresql_database
@@ -63,14 +70,20 @@ module ActiveRecord
       assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration }
     end
 
-    def test_create_when_database_exists_outputs_info_to_stderr
-      $stderr.expects(:puts).with("my-app-db already exists").once
+    def test_when_database_created_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
 
+      assert_equal $stdout.string, "Created database 'my-app-db'\n"
+    end
+
+    def test_create_when_database_exists_outputs_info_to_stderr
       ActiveRecord::Base.connection.stubs(:create_database).raises(
-        ActiveRecord::StatementInvalid.new('database "my-app-db" already exists')
+        ActiveRecord::Tasks::DatabaseAlreadyExists
       )
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
+
+      assert_equal $stderr.string, "Database 'my-app-db' already exists\n"
     end
   end
 
@@ -84,6 +97,13 @@ module ActiveRecord
 
       ActiveRecord::Base.stubs(:connection).returns(@connection)
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_establishes_connection_to_postgresql_database
@@ -101,6 +121,12 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.drop @configuration
     end
+
+    def test_when_database_dropped_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+
+      assert_equal $stdout.string, "Dropped database 'my-app-db'\n"
+    end
   end
 
   class PostgreSQLPurgeTest < ActiveRecord::TestCase
@@ -273,6 +299,5 @@ module ActiveRecord
       ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
     end
   end
-
 end
 end
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index 0aea0c3b38..13bc2c60fb 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -15,6 +15,13 @@ module ActiveRecord
       File.stubs(:exist?).returns(false)
       ActiveRecord::Base.stubs(:connection).returns(@connection)
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_db_checks_database_exists
@@ -23,12 +30,18 @@ module ActiveRecord
       ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
     end
 
+    def test_when_db_created_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+
+      assert_equal $stdout.string, "Created database '#{@database}'\n"
+    end
+
     def test_db_create_when_file_exists
       File.stubs(:exist?).returns(true)
 
-      $stderr.expects(:puts).with("#{@database} already exists")
-
       ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+
+      assert_equal $stderr.string, "Database '#{@database}' already exists\n"
     end
 
     def test_db_create_with_file_does_nothing
@@ -69,6 +82,13 @@ module ActiveRecord
       Pathname.stubs(:new).returns(@path)
       File.stubs(:join).returns('/former/relative/path')
       FileUtils.stubs(:rm).returns(true)
+
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    def teardown
+      $stdout, $stderr = @original_stdout, @original_stderr
     end
 
     def test_creates_path_from_database
@@ -103,6 +123,12 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
     end
+
+    def test_when_db_dropped_successfully_outputs_info_to_stdout
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+
+      assert_equal $stdout.string, "Dropped database '#{@database}'\n"
+    end
   end
 
   class SqliteDBCharsetTest < ActiveRecord::TestCase