diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2014-10-20 12:38:11 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2014-10-20 12:38:11 +0530 |
| commit | 2965e1671dda2c54c84d042f10e63f9496c5451e (patch) | |
| tree | 551248ed58c7389308f16789ce50961ffc48addd /activejob | |
| parent | c417311c4a2e5b33051986027a92f4aaf91b0e60 (diff) | |
| download | rails-2965e1671dda2c54c84d042f10e63f9496c5451e.tar.gz rails-2965e1671dda2c54c84d042f10e63f9496c5451e.tar.bz2 rails-2965e1671dda2c54c84d042f10e63f9496c5451e.zip | |
- Remove duplication in AJ logging test for setting logger.
- Remove un-needed require in AJ rescue test.
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/cases/logging_test.rb | 2 | ||||
| -rw-r--r-- | activejob/test/cases/rescue_test.rb | 2 |
2 files changed, 1 insertions, 3 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 |