move another migrator to use sensors

2 files changed, 18 insertions, 12 deletions

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index a2ce6dca3e..dbf8ca319c 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -245,18 +245,6 @@ class MigrationTest < ActiveRecord::TestCase
     assert names.include?('InnocentJointable')
   end
 
-  def test_target_version_zero_should_run_only_once
-    # migrate up to 1
-    ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
-
-    # migrate down to 0
-    ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
-
-    # migrate down to 0 again
-    proxies = ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
-    assert_equal [], proxies
-  end
-
   def test_migrator_db_has_no_schema_migrations_table
     # Oracle adapter raises error if semicolon is present as last character
     if current_adapter?(:OracleAdapter)
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
index bb507c635a..f7ef5f92d9 100644
--- a/activerecord/test/cases/migrator_test.rb
+++ b/activerecord/test/cases/migrator_test.rb
@@ -245,6 +245,24 @@ module ActiveRecord
       assert_equal 0, ActiveRecord::Migration.message_count
     end
 
+    def test_target_version_zero_should_run_only_once
+      calls, migrations = sensors(3)
+
+      # migrate up to 1
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [[:up, 0], [:up, 1]], calls
+      calls.clear
+
+      # migrate down to 0
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal [[:down, 1]], calls
+      calls.clear
+
+      # migrate down to 0 again
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal [], calls
+    end
+
     private
     def m(name, version, &block)
       x = Sensor.new name, version