Stub with Minitest instead of Mocha

Step 4 in #33162

1 files changed, 143 insertions, 84 deletions

diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index 728a13f2e6..1dcb06ceff 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -12,10 +12,6 @@ if current_adapter?(:PostgreSQLAdapter)
           "adapter"  => "postgresql",
           "database" => "my-app-db"
         }
-
-        ActiveRecord::Base.stubs(:connection).returns(@connection)
-        ActiveRecord::Base.stubs(:establish_connection)
-
         $stdout, @original_stdout = StringIO.new, $stdout
         $stderr, @original_stderr = StringIO.new, $stderr
       end
@@ -25,66 +21,94 @@ if current_adapter?(:PostgreSQLAdapter)
       end
 
       def test_establishes_connection_to_postgresql_database
-        ActiveRecord::Base.expects(:establish_connection).with(
-          "adapter"            => "postgresql",
-          "database"           => "postgres",
-          "schema_search_path" => "public"
-        )
-
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        ActiveRecord::Base.stubs(:establish_connection)
+        ActiveRecord::Base.stub(:connection, @connection) do
+          ActiveRecord::Base.expects(:establish_connection).with(
+            "adapter"            => "postgresql",
+            "database"           => "postgres",
+            "schema_search_path" => "public"
+          )
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        end
       end
 
       def test_creates_database_with_default_encoding
-        @connection.expects(:create_database).
-          with("my-app-db", @configuration.merge("encoding" => "utf8"))
+        with_stubbed_connection_establish_connection do
+          @connection.expects(:create_database).
+            with("my-app-db", @configuration.merge("encoding" => "utf8"))
 
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        end
       end
 
       def test_creates_database_with_given_encoding
-        @connection.expects(:create_database).
-          with("my-app-db", @configuration.merge("encoding" => "latin"))
+        with_stubbed_connection_establish_connection do
+          @connection.expects(:create_database).
+            with("my-app-db", @configuration.merge("encoding" => "latin"))
 
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration.
-          merge("encoding" => "latin")
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration.
+            merge("encoding" => "latin")
+        end
       end
 
       def test_creates_database_with_given_collation_and_ctype
-        @connection.expects(:create_database).
-          with("my-app-db", @configuration.merge("encoding" => "utf8", "collation" => "ja_JP.UTF8", "ctype" => "ja_JP.UTF8"))
+        with_stubbed_connection_establish_connection do
+          @connection.expects(:create_database).
+            with("my-app-db", @configuration.merge("encoding" => "utf8", "collation" => "ja_JP.UTF8", "ctype" => "ja_JP.UTF8"))
 
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration.
-          merge("collation" => "ja_JP.UTF8", "ctype" => "ja_JP.UTF8")
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration.
+            merge("collation" => "ja_JP.UTF8", "ctype" => "ja_JP.UTF8")
+        end
       end
 
       def test_establishes_connection_to_new_database
-        ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+        ActiveRecord::Base.stubs(:establish_connection)
+        ActiveRecord::Base.stub(:connection, @connection) do
+          ActiveRecord::Base.expects(:establish_connection).with(@configuration)
 
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        end
       end
 
       def test_db_create_with_error_prints_message
-        ActiveRecord::Base.stubs(:establish_connection).raises(Exception)
-
-        assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration }
-        assert_match "Couldn't create database for #{@configuration.inspect}", $stderr.string
+        ActiveRecord::Base.stub(:connection, @connection) do
+          ActiveRecord::Base.stub(:establish_connection, -> * { raise Exception }) do
+            assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration }
+            assert_match "Couldn't create database for #{@configuration.inspect}", $stderr.string
+          end
+        end
       end
 
       def test_when_database_created_successfully_outputs_info_to_stdout
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        with_stubbed_connection_establish_connection do
+          ActiveRecord::Tasks::DatabaseTasks.create @configuration
 
-        assert_equal "Created database 'my-app-db'\n", $stdout.string
+          assert_equal "Created database 'my-app-db'\n", $stdout.string
+        end
       end
 
       def test_create_when_database_exists_outputs_info_to_stderr
-        ActiveRecord::Base.connection.stubs(:create_database).raises(
-          ActiveRecord::Tasks::DatabaseAlreadyExists
-        )
-
-        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+        with_stubbed_connection_establish_connection do
+          ActiveRecord::Base.connection.stub(
+            :create_database,
+            proc { raise ActiveRecord::Tasks::DatabaseAlreadyExists }
+          ) do
+            ActiveRecord::Tasks::DatabaseTasks.create @configuration
 
-        assert_equal "Database 'my-app-db' already exists\n", $stderr.string
+            assert_equal "Database 'my-app-db' already exists\n", $stderr.string
+          end
+        end
       end
+
+      private
+
+        def with_stubbed_connection_establish_connection
+          ActiveRecord::Base.stub(:connection, @connection) do
+            ActiveRecord::Base.stub(:establish_connection, nil) do
+              yield
+            end
+          end
+        end
     end
 
     class PostgreSQLDBDropTest < ActiveRecord::TestCase
@@ -94,10 +118,6 @@ if current_adapter?(:PostgreSQLAdapter)
           "adapter"  => "postgresql",
           "database" => "my-app-db"
         }
-
-        ActiveRecord::Base.stubs(:connection).returns(@connection)
-        ActiveRecord::Base.stubs(:establish_connection)
-
         $stdout, @original_stdout = StringIO.new, $stdout
         $stderr, @original_stderr = StringIO.new, $stderr
       end
@@ -107,26 +127,41 @@ if current_adapter?(:PostgreSQLAdapter)
       end
 
       def test_establishes_connection_to_postgresql_database
-        ActiveRecord::Base.expects(:establish_connection).with(
-          "adapter"            => "postgresql",
-          "database"           => "postgres",
-          "schema_search_path" => "public"
-        )
-
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+        ActiveRecord::Base.stub(:connection, @connection) do
+          ActiveRecord::Base.expects(:establish_connection).with(
+            "adapter"            => "postgresql",
+            "database"           => "postgres",
+            "schema_search_path" => "public"
+          )
+          ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+        end
       end
 
       def test_drops_database
-        @connection.expects(:drop_database).with("my-app-db")
+        with_stubbed_connection_establish_connection do
+          @connection.expects(:drop_database).with("my-app-db")
 
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+          ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+        end
       end
 
       def test_when_database_dropped_successfully_outputs_info_to_stdout
-        ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+        with_stubbed_connection_establish_connection do
+          ActiveRecord::Tasks::DatabaseTasks.drop @configuration
 
-        assert_equal "Dropped database 'my-app-db'\n", $stdout.string
+          assert_equal "Dropped database 'my-app-db'\n", $stdout.string
+        end
       end
+
+      private
+
+        def with_stubbed_connection_establish_connection
+          ActiveRecord::Base.stub(:connection, @connection) do
+            ActiveRecord::Base.stub(:establish_connection, nil) do
+              yield
+            end
+          end
+        end
     end
 
     class PostgreSQLPurgeTest < ActiveRecord::TestCase
@@ -139,45 +174,68 @@ if current_adapter?(:PostgreSQLAdapter)
           "adapter"  => "postgresql",
           "database" => "my-app-db"
         }
-
-        ActiveRecord::Base.stubs(:connection).returns(@connection)
-        ActiveRecord::Base.stubs(:establish_connection)
       end
 
       def test_clears_active_connections
-        ActiveRecord::Base.expects(:clear_active_connections!)
+        with_stubbed_connection do
+          ActiveRecord::Base.stub(:establish_connection, nil) do
+            ActiveRecord::Base.expects(:clear_active_connections!)
 
-        ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+            ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+          end
+        end
       end
 
       def test_establishes_connection_to_postgresql_database
-        ActiveRecord::Base.expects(:establish_connection).with(
-          "adapter"            => "postgresql",
-          "database"           => "postgres",
-          "schema_search_path" => "public"
-        )
-
-        ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+        ActiveRecord::Base.stubs(:establish_connection)
+        with_stubbed_connection do
+          ActiveRecord::Base.expects(:establish_connection).with(
+            "adapter"            => "postgresql",
+            "database"           => "postgres",
+            "schema_search_path" => "public"
+          )
+
+          ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+        end
       end
 
       def test_drops_database
-        @connection.expects(:drop_database).with("my-app-db")
+        with_stubbed_connection do
+          ActiveRecord::Base.stub(:establish_connection, nil) do
+            @connection.expects(:drop_database).with("my-app-db")
 
-        ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+            ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+          end
+        end
       end
 
       def test_creates_database
-        @connection.expects(:create_database).
-          with("my-app-db", @configuration.merge("encoding" => "utf8"))
+        with_stubbed_connection do
+          ActiveRecord::Base.stub(:establish_connection, true) do
+            @connection.expects(:create_database).
+              with("my-app-db", @configuration.merge("encoding" => "utf8"))
 
-        ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+            ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+          end
+        end
       end
 
       def test_establishes_connection
-        ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+        ActiveRecord::Base.stubs(:establish_connection)
+        with_stubbed_connection do
+          ActiveRecord::Base.expects(:establish_connection).with(@configuration)
 
-        ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+          ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+        end
       end
+
+      private
+
+        def with_stubbed_connection
+          ActiveRecord::Base.stub(:connection, @connection) do
+            yield
+          end
+        end
     end
 
     class PostgreSQLDBCharsetTest < ActiveRecord::TestCase
@@ -187,14 +245,14 @@ if current_adapter?(:PostgreSQLAdapter)
           "adapter"  => "postgresql",
           "database" => "my-app-db"
         }
-
-        ActiveRecord::Base.stubs(:connection).returns(@connection)
-        ActiveRecord::Base.stubs(:establish_connection)
       end
 
       def test_db_retrieves_charset
-        @connection.expects(:encoding)
-        ActiveRecord::Tasks::DatabaseTasks.charset @configuration
+        ActiveRecord::Base.stub(:connection, @connection) do
+          @connection.expects(:encoding)
+
+          ActiveRecord::Tasks::DatabaseTasks.charset @configuration
+        end
       end
     end
 
@@ -205,13 +263,14 @@ if current_adapter?(:PostgreSQLAdapter)
           "adapter"  => "postgresql",
           "database" => "my-app-db"
         }
-
-        ActiveRecord::Base.stubs(:connection).returns(@connection)
       end
 
       def test_db_retrieves_collation
-        @connection.expects(:collation)
-        ActiveRecord::Tasks::DatabaseTasks.collation @configuration
+        ActiveRecord::Base.stub(:connection, @connection) do
+          @connection.expects(:collation)
+
+          ActiveRecord::Tasks::DatabaseTasks.collation @configuration
+        end
       end
     end
 
@@ -241,12 +300,12 @@ if current_adapter?(:PostgreSQLAdapter)
       end
 
       def test_structure_dump_header_comments_removed
-        Kernel.stubs(:system).returns(true)
-        File.write(@filename, "-- header comment\n\n-- more header comment\n statement \n-- lower comment\n")
-
-        ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename)
+        Kernel.stub(:system, true) do
+          File.write(@filename, "-- header comment\n\n-- more header comment\n statement \n-- lower comment\n")
+          ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename)
 
-        assert_equal [" statement \n", "-- lower comment\n"], File.readlines(@filename).first(2)
+          assert_equal [" statement \n", "-- lower comment\n"], File.readlines(@filename).first(2)
+        end
       end
 
       def test_structure_dump_with_extra_flags