2 files changed, 26 insertions, 18 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 2573c77405..1d1a9a221a 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -601,24 +601,6 @@ class MigrationTest < ActiveRecord::TestCase
     Person.connection.drop_table :binary_testings rescue nil
   end
 
-  def test_migrator_with_duplicates
-    assert_raise(ActiveRecord::DuplicateMigrationVersionError) do
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate", nil)
-    end
-  end
-
-  def test_migrator_with_duplicate_names
-    assert_raise(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate_names", nil)
-    end
-  end
-
-  def test_migrator_with_missing_version_numbers
-    assert_raise(ActiveRecord::UnknownMigrationVersionError) do
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/missing", 500)
-    end
-  end
-
   def test_create_table_with_custom_sequence_name
     skip "not supported" unless current_adapter? :OracleAdapter
 
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
new file mode 100644
index 0000000000..b0d514e50d
--- /dev/null
+++ b/activerecord/test/cases/migrator_test.rb
@@ -0,0 +1,26 @@
+require "cases/helper"
+
+module ActiveRecord
+  class MigratorTest < ActiveRecord::TestCase
+    def test_migrator_with_duplicate_names
+      assert_raises(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
+        list = [Migration.new('Chunky'), Migration.new('Chunky')]
+        ActiveRecord::Migrator.new(:up, list)
+      end
+    end
+
+    def test_migrator_with_duplicate_versions
+      assert_raises(ActiveRecord::DuplicateMigrationVersionError) do
+        list = [Migration.new('Foo', 1), Migration.new('Bar', 1)]
+        ActiveRecord::Migrator.new(:up, list)
+      end
+    end
+
+    def test_migrator_with_missing_version_numbers
+      assert_raises(ActiveRecord::UnknownMigrationVersionError) do
+        list = [Migration.new('Foo', 1), Migration.new('Bar', 2)]
+        ActiveRecord::Migrator.new(:up, list, 3).run
+      end
+    end
+  end
+end