2 files changed, 17 insertions, 4 deletions
diff --git a/activerecord/test/cases/migration/compatibility_test.rb b/activerecord/test/cases/migration/compatibility_test.rb
index 6d5b6243db..60ca90464d 100644
--- a/activerecord/test/cases/migration/compatibility_test.rb
+++ b/activerecord/test/cases/migration/compatibility_test.rb
@@ -21,7 +21,7 @@ module ActiveRecord
       teardown do
         connection.drop_table :testings rescue nil
         ActiveRecord::Migration.verbose = @verbose_was
-        ActiveRecord::SchemaMigration.delete_all
+        ActiveRecord::SchemaMigration.delete_all rescue nil
       end
 
       def test_migration_doesnt_remove_named_index
@@ -101,6 +101,18 @@ module ActiveRecord
         assert connection.columns(:testings).find { |c| c.name == 'created_at' }.null
         assert connection.columns(:testings).find { |c| c.name == 'updated_at' }.null
       end
+
+      def test_legacy_migrations_get_deprecation_warning_when_run
+        migration = Class.new(ActiveRecord::Migration) {
+          def up
+            add_column :testings, :baz, :string
+          end
+        }
+
+        assert_deprecated do
+          migration.migrate :up
+        end
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index bae0467e72..4ad0e59a05 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -587,7 +587,8 @@ class MigrationTest < ActiveRecord::TestCase
 
   if current_adapter?(:Mysql2Adapter, :PostgreSQLAdapter)
     def test_out_of_range_limit_should_raise
-      Person.connection.drop_table :test_limits rescue nil
+      Person.connection.drop_table :test_integer_limits, if_exists: true
+
       e = assert_raise(ActiveRecord::ActiveRecordError, "integer limit didn't raise") do
         Person.connection.create_table :test_integer_limits, :force => true do |t|
           t.column :bigone, :integer, :limit => 10
@@ -603,8 +604,8 @@ class MigrationTest < ActiveRecord::TestCase
           end
         end
       end
-
-      Person.connection.drop_table :test_limits rescue nil
+    ensure
+      Person.connection.drop_table :test_integer_limits, if_exists: true
     end
   end