From 2965e1671dda2c54c84d042f10e63f9496c5451e Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Mon, 20 Oct 2014 12:38:11 +0530 Subject: - Remove duplication in AJ logging test for setting logger. - Remove un-needed require in AJ rescue test. --- activejob/test/cases/logging_test.rb | 2 +- activejob/test/cases/rescue_test.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'activejob/test') 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 -- cgit v1.2.3