1 files changed, 9 insertions, 1 deletions
diff --git a/spec/support/migrations_helpers.rb b/spec/support/migrations_helpers.rb
index 06322aa0586..6bf976a2cf9 100644
--- a/spec/support/migrations_helpers.rb
+++ b/spec/support/migrations_helpers.rb
@@ -45,7 +45,13 @@ module MigrationsHelpers
   end
 
   def migration_schema_version
-    self.class.metadata[:schema] || previous_migration.version
+    metadata_schema = self.class.metadata[:schema]
+
+    if metadata_schema == :latest
+      migrations.last.version
+    else
+      metadata_schema || previous_migration.version
+    end
   end
 
   def schema_migrate_down!
@@ -58,6 +64,8 @@ module MigrationsHelpers
   end
 
   def schema_migrate_up!
+    reset_column_in_all_models
+
     disable_migrations_output do
       ActiveRecord::Migrator.migrate(migrations_paths)
     end