Merge pull request #37101 from eugeneius/active_job_sidekiq_integration_tests

Fix Active Job Sidekiq integration tests

Gemfile.lock

@@ -372,7 +372,7 @@ GEM
     rb-fsevent (0.10.3)
     rdoc (6.0.4)
     redcarpet (3.2.3)
-    redis (4.0.1)
+    redis (4.1.2)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     representable (3.0.4)
@@ -422,11 +422,11 @@ GEM
     sequel (5.8.0)
     serverengine (2.0.6)
       sigdump (~> 0.2.2)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.0.0)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
     sigdump (0.2.4)
     signet (0.8.1)
       addressable (~> 2.3)

activejob/test/support/integration/adapters/sidekiq.rb

@@ -36,7 +36,7 @@ def start_workers
       $stderr.sync = true
 
       logfile = Rails.root.join("log/sidekiq.log").to_s
-      Sidekiq::Logging.initialize_logger(logfile)
+      Sidekiq.logger = Sidekiq::Logger.new(logfile)
 
       self_read, self_write = IO.pipe
       trap "TERM" do