Merge pull request #17331 from vipulnsward/activejob-cleanups

Activejob cleanups

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)

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

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