aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-11 11:48:14 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-13 14:33:53 -0800
commit974a6402d70fa6bb1ecfc43b4925717b474df4d0 (patch)
treeeda16b5d5fd6101a2b01e4d858432be993f1a15f /activerecord/test
parentbc276fbc2a94778686e3ec4a950926083b4e9778 (diff)
downloadrails-974a6402d70fa6bb1ecfc43b4925717b474df4d0.tar.gz
rails-974a6402d70fa6bb1ecfc43b4925717b474df4d0.tar.bz2
rails-974a6402d70fa6bb1ecfc43b4925717b474df4d0.zip
moving logger test to its own file
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/migration/logger_test.rb17
-rw-r--r--activerecord/test/cases/migration_test.rb13
2 files changed, 17 insertions, 13 deletions
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb
new file mode 100644
index 0000000000..a892afda91
--- /dev/null
+++ b/activerecord/test/cases/migration/logger_test.rb
@@ -0,0 +1,17 @@
+require "cases/helper"
+
+module ActiveRecord
+ class Migration
+ class LoggerTest < ActiveRecord::TestCase
+ def test_migration_should_be_run_without_logger
+ previous_logger = ActiveRecord::Base.logger
+ ActiveRecord::Base.logger = nil
+ assert_nothing_raised do
+ ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
+ end
+ ensure
+ ActiveRecord::Base.logger = previous_logger
+ end
+ end
+ end
+end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 9038ebd320..669989522d 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1238,19 +1238,6 @@ class MigrationTest < ActiveRecord::TestCase
ensure
old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
end
-
-end
-
-class MigrationLoggerTest < ActiveRecord::TestCase
- def test_migration_should_be_run_without_logger
- previous_logger = ActiveRecord::Base.logger
- ActiveRecord::Base.logger = nil
- assert_nothing_raised do
- ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
- end
- ensure
- ActiveRecord::Base.logger = previous_logger
- end
end
class InterleavedMigrationsTest < ActiveRecord::TestCase