1 files changed, 86 insertions, 43 deletions
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 80437d4400..1f79f1a630 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -15,6 +15,7 @@ module ActiveRecord
           def charset; end
           def collation; end
           def structure_dump(*); end
+          def structure_load(*); end
         end.new
       )
 
@@ -119,8 +120,9 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_create") do
         with_stubbed_new do
-          eval("@#{v}").expects(:create)
-          ActiveRecord::Tasks::DatabaseTasks.create "adapter" => k
+          assert_called(eval("@#{v}"), :create) do
+            ActiveRecord::Tasks::DatabaseTasks.create "adapter" => k
+          end
         end
       end
     end
@@ -141,7 +143,6 @@ module ActiveRecord
     def setup
       @configurations = { "development" => { "database" => "my-db" } }
 
-      ActiveRecord::Base.stubs(:configurations).returns(@configurations)
       # To refrain from connecting to a newly created empty DB in sqlite3_mem tests
       ActiveRecord::Base.connection_handler.stubs(:establish_connection)
 
@@ -156,52 +157,71 @@ module ActiveRecord
     def test_ignores_configurations_without_databases
       @configurations["development"].merge!("database" => nil)
 
-      assert_not_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
-        ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        assert_not_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
+          ActiveRecord::Tasks::DatabaseTasks.create_all
+        end
       end
     end
 
     def test_ignores_remote_databases
       @configurations["development"].merge!("host" => "my.server.tld")
-      $stderr.stubs(:puts)
 
-      assert_not_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
-        ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        assert_not_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
+          ActiveRecord::Tasks::DatabaseTasks.create_all
+        end
       end
     end
 
     def test_warning_for_remote_databases
       @configurations["development"].merge!("host" => "my.server.tld")
 
-      ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        ActiveRecord::Tasks::DatabaseTasks.create_all
 
-      assert_match "This task only modifies local databases. my-db is on a remote host.",
-        $stderr.string
+        assert_match "This task only modifies local databases. my-db is on a remote host.",
+          $stderr.string
+      end
     end
 
     def test_creates_configurations_with_local_ip
       @configurations["development"].merge!("host" => "127.0.0.1")
 
-      assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
-        ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
+          ActiveRecord::Tasks::DatabaseTasks.create_all
+        end
       end
     end
 
     def test_creates_configurations_with_local_host
       @configurations["development"].merge!("host" => "localhost")
 
-      assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
-        ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
+          ActiveRecord::Tasks::DatabaseTasks.create_all
+        end
       end
     end
 
     def test_creates_configurations_with_blank_hosts
       @configurations["development"].merge!("host" => nil)
 
-      assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
-        ActiveRecord::Tasks::DatabaseTasks.create_all
+      with_stubbed_configurations do
+        assert_called(ActiveRecord::Tasks::DatabaseTasks, :create) do
+          ActiveRecord::Tasks::DatabaseTasks.create_all
+        end
       end
     end
+
+    private
+
+      def with_stubbed_configurations
+        ActiveRecord::Base.stub(:configurations, @configurations) do
+          yield
+        end
+      end
   end
 
   class DatabaseTasksCreateCurrentTest < ActiveRecord::TestCase
@@ -389,11 +409,15 @@ module ActiveRecord
 
     def test_establishes_connection_for_the_given_environments_config
       ActiveRecord::Tasks::DatabaseTasks.stub(:create, nil) do
-        ActiveRecord::Base.expects(:establish_connection).with(:development)
-
-        ActiveRecord::Tasks::DatabaseTasks.create_current(
-          ActiveSupport::StringInquirer.new("development")
-        )
+        assert_called_with(
+          ActiveRecord::Base,
+          :establish_connection,
+          [:development]
+        ) do
+          ActiveRecord::Tasks::DatabaseTasks.create_current(
+            ActiveSupport::StringInquirer.new("development")
+          )
+        end
       end
     end
 
@@ -414,8 +438,9 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_drop") do
         with_stubbed_new do
-          eval("@#{v}").expects(:drop)
-          ActiveRecord::Tasks::DatabaseTasks.drop "adapter" => k
+          assert_called(eval("@#{v}"), :drop) do
+            ActiveRecord::Tasks::DatabaseTasks.drop "adapter" => k
+          end
         end
       end
     end
@@ -794,8 +819,9 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_purge") do
         with_stubbed_new do
-          eval("@#{v}").expects(:purge)
-          ActiveRecord::Tasks::DatabaseTasks.purge "adapter" => k
+          assert_called(eval("@#{v}"), :purge) do
+            ActiveRecord::Tasks::DatabaseTasks.purge "adapter" => k
+          end
         end
       end
     end
@@ -809,11 +835,14 @@ module ActiveRecord
         "production"  => { "database" => "prod-db" }
       }
       ActiveRecord::Base.stub(:configurations, configurations) do
-        ActiveRecord::Tasks::DatabaseTasks.expects(:purge).
-          with("database" => "prod-db")
-
-        assert_called_with(ActiveRecord::Base, :establish_connection, [:production]) do
-          ActiveRecord::Tasks::DatabaseTasks.purge_current("production")
+        assert_called_with(
+          ActiveRecord::Tasks::DatabaseTasks,
+          :purge,
+          ["database" => "prod-db"]
+        ) do
+          assert_called_with(ActiveRecord::Base, :establish_connection, [:production]) do
+            ActiveRecord::Tasks::DatabaseTasks.purge_current("production")
+          end
         end
       end
     end
@@ -823,10 +852,13 @@ module ActiveRecord
     def test_purge_all_local_configurations
       configurations = { development: { "database" => "my-db" } }
       ActiveRecord::Base.stub(:configurations, configurations) do
-        ActiveRecord::Tasks::DatabaseTasks.expects(:purge).
-          with("database" => "my-db")
-
-        ActiveRecord::Tasks::DatabaseTasks.purge_all
+        assert_called_with(
+          ActiveRecord::Tasks::DatabaseTasks,
+          :purge,
+          ["database" => "my-db"]
+        ) do
+          ActiveRecord::Tasks::DatabaseTasks.purge_all
+        end
       end
     end
   end
@@ -837,8 +869,9 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_charset") do
         with_stubbed_new do
-          eval("@#{v}").expects(:charset)
-          ActiveRecord::Tasks::DatabaseTasks.charset "adapter" => k
+          assert_called(eval("@#{v}"), :charset) do
+            ActiveRecord::Tasks::DatabaseTasks.charset "adapter" => k
+          end
         end
       end
     end
@@ -850,8 +883,9 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_collation") do
         with_stubbed_new do
-          eval("@#{v}").expects(:collation)
-          ActiveRecord::Tasks::DatabaseTasks.collation "adapter" => k
+          assert_called(eval("@#{v}"), :collation) do
+            ActiveRecord::Tasks::DatabaseTasks.collation "adapter" => k
+          end
         end
       end
     end
@@ -965,8 +999,12 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_structure_dump") do
         with_stubbed_new do
-          eval("@#{v}").expects(:structure_dump).with("awesome-file.sql", nil)
-          ActiveRecord::Tasks::DatabaseTasks.structure_dump({ "adapter" => k }, "awesome-file.sql")
+          assert_called_with(
+            eval("@#{v}"), :structure_dump,
+            ["awesome-file.sql", nil]
+          ) do
+            ActiveRecord::Tasks::DatabaseTasks.structure_dump({ "adapter" => k }, "awesome-file.sql")
+          end
         end
       end
     end
@@ -978,8 +1016,13 @@ module ActiveRecord
     ADAPTERS_TASKS.each do |k, v|
       define_method("test_#{k}_structure_load") do
         with_stubbed_new do
-          eval("@#{v}").expects(:structure_load).with("awesome-file.sql", nil)
-          ActiveRecord::Tasks::DatabaseTasks.structure_load({ "adapter" => k }, "awesome-file.sql")
+          assert_called_with(
+            eval("@#{v}"),
+            :structure_load,
+            ["awesome-file.sql", nil]
+          ) do
+            ActiveRecord::Tasks::DatabaseTasks.structure_load({ "adapter" => k }, "awesome-file.sql")
+          end
         end
       end
     end