diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-20 18:33:47 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-20 18:33:47 -0200 |
| commit | f1e189410124acc5cd3c84c6b3d992ae3f00c962 (patch) | |
| tree | 53b25bc296a74e92785db0d77c069c86efb152fc | |
| parent | c1dc9b3584d289659297c51284e4e0e23f1c8d15 (diff) | |
| parent | 2965e1671dda2c54c84d042f10e63f9496c5451e (diff) | |
| download | rails-f1e189410124acc5cd3c84c6b3d992ae3f00c962.tar.gz rails-f1e189410124acc5cd3c84c6b3d992ae3f00c962.tar.bz2 rails-f1e189410124acc5cd3c84c6b3d992ae3f00c962.zip | |
Merge pull request #17331 from vipulnsward/activejob-cleanups
Activejob cleanups
| -rw-r--r-- | activejob/test/cases/logging_test.rb | 2 | ||||
| -rw-r--r-- | activejob/test/cases/rescue_test.rb | 2 | ||||
| -rw-r--r-- | activejob/test/helper.rb | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb index 9c56ee08b6..3d4e561117 100644 --- a/activejob/test/cases/logging_test.rb +++ b/activejob/test/cases/logging_test.rb @@ -33,7 +33,7 @@ class AdapterTest < ActiveSupport::TestCase def teardown super ActiveJob::Logging::LogSubscriber.log_subscribers.pop - ActiveJob::Base.logger = @old_logger + set_logger @old_logger end def set_logger(logger) diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb index 1b6c2e9fac..58c9ca8992 100644 --- a/activejob/test/cases/rescue_test.rb +++ b/activejob/test/cases/rescue_test.rb @@ -2,8 +2,6 @@ require 'helper' require 'jobs/rescue_job' require 'models/person' -require 'active_support/core_ext/object/inclusion' - class RescueTest < ActiveSupport::TestCase setup do JobBuffer.clear diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index ce22833b11..ec0c8a8ede 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -26,5 +26,4 @@ end require 'active_support/testing/autorun' -ActiveJob::Base.logger.level = Logger::DEBUG ActiveSupport::TestCase.test_order = :random |