diff options
| author | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
|---|---|---|
| committer | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
| commit | 117f09c5d1eb600908001bb7b5ee353756e56456 (patch) | |
| tree | 717d45020cf652840f90c09579692e30bf31237b /activerecord/test/cases/ar_schema_test.rb | |
| parent | 8caf16a281260fedb0677c85047469e99c48da94 (diff) | |
| parent | 75780373af9a3ddd4cc1bda3d4dbfe6121102b2e (diff) | |
| download | rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.gz rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.bz2 rails-117f09c5d1eb600908001bb7b5ee353756e56456.zip | |
Merge remote-tracking branch 'origin/master' into guides-template-inheritance
Diffstat (limited to 'activerecord/test/cases/ar_schema_test.rb')
| -rw-r--r-- | activerecord/test/cases/ar_schema_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb index 3f5858714a..b6333240a8 100644 --- a/activerecord/test/cases/ar_schema_test.rb +++ b/activerecord/test/cases/ar_schema_test.rb @@ -5,7 +5,9 @@ if ActiveRecord::Base.connection.supports_migrations? class ActiveRecordSchemaTest < ActiveRecord::TestCase self.use_transactional_fixtures = false - def setup + setup do + @original_verbose = ActiveRecord::Migration.verbose + ActiveRecord::Migration.verbose = false @connection = ActiveRecord::Base.connection ActiveRecord::SchemaMigration.drop_table end @@ -16,6 +18,7 @@ if ActiveRecord::Base.connection.supports_migrations? @connection.drop_table :nep_schema_migrations rescue nil @connection.drop_table :has_timestamps rescue nil ActiveRecord::SchemaMigration.delete_all rescue nil + ActiveRecord::Migration.verbose = @original_verbose end def test_has_no_primary_key |