From ad2af42bb299f762a5a969370ee5378d34ebbc53 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 12 Jan 2012 15:53:47 -0800 Subject: move another migrator test to the correct class --- activerecord/test/cases/migration_test.rb | 11 ----------- activerecord/test/cases/migrator_test.rb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 7e3ffa2012..837287f2c2 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -329,17 +329,6 @@ class MigrationTest < ActiveRecord::TestCase assert_equal migrations[0].name, 'InterleavedInnocentJointable' end - def test_relative_migrations - list = Dir.chdir(MIGRATIONS_ROOT) do - ActiveRecord::Migrator.up("valid/", 1) - end - - migration_proxy = list.find { |item| - item.name == 'ValidPeopleHaveLastNames' - } - assert migration_proxy, 'should find pending migration' - 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 d32da8a029..45d070d86e 100644 --- a/activerecord/test/cases/migrator_test.rb +++ b/activerecord/test/cases/migrator_test.rb @@ -60,5 +60,16 @@ module ActiveRecord ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2") end end + + def test_relative_migrations + list = Dir.chdir(MIGRATIONS_ROOT) do + ActiveRecord::Migrator.migrations("valid/") + end + + migration_proxy = list.find { |item| + item.name == 'ValidPeopleHaveLastNames' + } + assert migration_proxy, 'should find pending migration' + end end end -- cgit v1.2.3