From ff5c385620c74f265e31e284e199fe29764622c6 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 13 Jan 2012 10:30:52 -0800 Subject: move another migrator test, use schema migration model --- activerecord/test/cases/migration_test.rb | 10 ---------- activerecord/test/cases/migrator_test.rb | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 837287f2c2..dfe55cfb16 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -319,16 +319,6 @@ class MigrationTest < ActiveRecord::TestCase assert_match(/20100201010101.*20100301010101/m, schema_info) end - def test_finds_pending_migrations - ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1) - migration_list = ActiveRecord::Migrator.migrations(MIGRATIONS_ROOT + "/interleaved/pass_2") - migrations = ActiveRecord::Migrator.new(:up, migration_list).pending_migrations - - assert_equal 1, migrations.size - assert_equal migrations[0].version, 3 - assert_equal migrations[0].name, 'InterleavedInnocentJointable' - end - def test_only_loads_pending_migrations # migrate up to 1 ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1) diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb index 45d070d86e..d938eca575 100644 --- a/activerecord/test/cases/migrator_test.rb +++ b/activerecord/test/cases/migrator_test.rb @@ -71,5 +71,14 @@ module ActiveRecord } assert migration_proxy, 'should find pending migration' end + + def test_finds_pending_migrations + ActiveRecord::SchemaMigration.create!(:version => '1') + migration_list = [ Migration.new('foo', 1), Migration.new('bar', 3) ] + migrations = ActiveRecord::Migrator.new(:up, migration_list).pending_migrations + + assert_equal 1, migrations.size + assert_equal migration_list.last, migrations.first + end end end -- cgit v1.2.3