aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2017-01-08 00:35:36 -0300
committerGitHub <noreply@github.com>2017-01-08 00:35:36 -0300
commit80bf3384152a640a36682db875241e2d92db511f (patch)
treefc7f2e094fe5c3bd5e65c815a4792f29dfc32040
parent533da1d5a9c78a9b8511ad1ea70958c0908a2191 (diff)
parent33191e2079ff5027cb89d27bbc2b6a4e67f9afaf (diff)
downloadrails-80bf3384152a640a36682db875241e2d92db511f.tar.gz
rails-80bf3384152a640a36682db875241e2d92db511f.tar.bz2
rails-80bf3384152a640a36682db875241e2d92db511f.zip
Merge pull request #27603 from prathamesh-sonpatki/fix-random-failure
Fix random failure related to migration environment
-rw-r--r--activerecord/test/cases/migration_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 1602b3f757..4edb807bbb 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -399,6 +399,7 @@ class MigrationTest < ActiveRecord::TestCase
ActiveRecord::Migrator.migrations_paths = old_path
ENV["RAILS_ENV"] = original_rails_env
ENV["RACK_ENV"] = original_rack_env
+ ActiveRecord::Migrator.up(migrations_path)
end
def test_migration_sets_internal_metadata_even_when_fully_migrated
@@ -425,6 +426,7 @@ class MigrationTest < ActiveRecord::TestCase
ActiveRecord::Migrator.migrations_paths = old_path
ENV["RAILS_ENV"] = original_rails_env
ENV["RACK_ENV"] = original_rack_env
+ ActiveRecord::Migrator.up(migrations_path)
end
def test_internal_metadata_stores_environment_when_other_data_exists