From 247d274cabae827766c1c5b9deb34fb34548fc5e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 16 Jan 2012 11:28:00 -0800 Subject: moving verbosity tests to the migrator test, removing ddl changes --- activerecord/lib/active_record/migration.rb | 3 +-- activerecord/test/cases/migration_test.rb | 18 ------------------ activerecord/test/cases/migrator_test.rb | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index a79c7fac1d..2a9139749d 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -341,14 +341,13 @@ module ActiveRecord cattr_accessor :verbose - attr_accessor :name, :version, :verbose + attr_accessor :name, :version def initialize(name = self.class.name, version = nil) @name = name @version = version @connection = nil @reverting = false - @verbose = self.class.verbose end # instantiate the delegate object after initialize is defined diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 9b80ea92a2..a2ce6dca3e 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -269,24 +269,6 @@ class MigrationTest < ActiveRecord::TestCase end end - def test_migrator_verbosity - ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1) - assert_not_equal 0, ActiveRecord::Migration.message_count - ActiveRecord::Migration.message_count = 0 - - ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0) - assert_not_equal 0, ActiveRecord::Migration.message_count - ActiveRecord::Migration.message_count = 0 - end - - def test_migrator_verbosity_off - ActiveRecord::Migration.verbose = false - ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1) - assert_equal 0, ActiveRecord::Migration.message_count - ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0) - assert_equal 0, ActiveRecord::Migration.message_count - end - def test_migrator_going_down_due_to_version_target ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1) ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0) diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb index 5553798cc7..bb507c635a 100644 --- a/activerecord/test/cases/migrator_test.rb +++ b/activerecord/test/cases/migrator_test.rb @@ -221,6 +221,30 @@ module ActiveRecord assert_equal(0, ActiveRecord::Migrator.current_version) end + def test_migrator_verbosity + _, migrations = sensors(3) + + ActiveRecord::Migrator.new(:up, migrations, 1).migrate + assert_not_equal 0, ActiveRecord::Migration.message_count + + ActiveRecord::Migration.message_count = 0 + + ActiveRecord::Migrator.new(:down, migrations, 0).migrate + assert_not_equal 0, ActiveRecord::Migration.message_count + ActiveRecord::Migration.message_count = 0 + end + + def test_migrator_verbosity_off + _, migrations = sensors(3) + + ActiveRecord::Migration.message_count = 0 + ActiveRecord::Migration.verbose = false + ActiveRecord::Migrator.new(:up, migrations, 1).migrate + assert_equal 0, ActiveRecord::Migration.message_count + ActiveRecord::Migrator.new(:down, migrations, 0).migrate + assert_equal 0, ActiveRecord::Migration.message_count + end + private def m(name, version, &block) x = Sensor.new name, version -- cgit v1.2.3