Merge remote-tracking branch 'upstream/master'

1 files changed, 37 insertions, 2 deletions

diff --git a/activerecord/test/cases/invertible_migration_test.rb b/activerecord/test/cases/invertible_migration_test.rb
index afec64750e..3ae7b63dff 100644
--- a/activerecord/test/cases/invertible_migration_test.rb
+++ b/activerecord/test/cases/invertible_migration_test.rb
@@ -27,6 +27,19 @@ module ActiveRecord
       end
     end
 
+    class LegacyMigration < ActiveRecord::Migration
+      def self.up
+        create_table("horses") do |t|
+          t.column :content, :text
+          t.column :remind_at, :datetime
+        end
+      end
+
+      def self.down
+        drop_table("horses")
+      end
+    end
+
     def teardown
       if ActiveRecord::Base.connection.table_exists?("horses")
         ActiveRecord::Base.connection.drop_table("horses")
@@ -41,17 +54,39 @@ module ActiveRecord
       end
     end
 
-    def test_up
+    def test_migrate_up
       migration = InvertibleMigration.new
       migration.migrate(:up)
       assert migration.connection.table_exists?("horses"), "horses should exist"
     end
 
-    def test_down
+    def test_migrate_down
       migration = InvertibleMigration.new
       migration.migrate :up
       migration.migrate :down
       assert !migration.connection.table_exists?("horses")
     end
+
+    def test_legacy_up
+      LegacyMigration.migrate :up
+      assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist"
+    end
+
+    def test_legacy_down
+      LegacyMigration.migrate :up
+      LegacyMigration.migrate :down
+      assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist"
+    end
+
+    def test_up
+      LegacyMigration.up
+      assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist"
+    end
+
+    def test_down
+      LegacyMigration.up
+      LegacyMigration.down
+      assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist"
+    end
   end
 end