3 files changed, 9 insertions, 57 deletions
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
deleted file mode 100644
index 67db03e279..0000000000
--- a/activejob/test/support/integration/adapters/qu.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module QuJobsManager
-  def setup
-    require "qu-rails"
-    require "qu-redis"
-    ActiveJob::Base.queue_adapter = :qu
-    ENV["REDISTOGO_URL"] = "redis://127.0.0.1:6379/12"
-    backend = Qu::Backend::Redis.new
-    backend.namespace = "active_jobs_int_test"
-    Qu.backend  = backend
-    Qu.logger   = Rails.logger
-    Qu.interval = 0.5
-    unless can_run?
-      puts "Cannot run integration tests for qu. To be able to run integration tests for qu you need to install and start redis.\n"
-      exit
-    end
-  end
-
-  def clear_jobs
-    Qu.clear "integration_tests"
-  end
-
-  def start_workers
-    @thread = Thread.new { Qu::Worker.new("integration_tests").start }
-  end
-
-  def stop_workers
-    @thread.kill
-  end
-
-  def can_run?
-    begin
-      Qu.backend.connection.client.connect
-    rescue
-      return false
-    end
-    true
-  end
-end
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index 484b476567..2ed8302277 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -3,11 +3,12 @@
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
-    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://:password@127.0.0.1:6379/12", thread_safe: true)
+    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.new(url: "redis://127.0.0.1:6379/12", thread_safe: true)
     Resque.logger = Rails.logger
     unless can_run?
       puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n"
-      exit
+      status = ENV["CI"] ? false : true
+      exit status
     end
   end
 
@@ -41,11 +42,8 @@ module ResqueJobsManager
   end
 
   def can_run?
-    begin
-      Resque.redis.client.connect
-    rescue
-      return false
-    end
-    true
+    Resque.redis.ping == "PONG"
+  rescue
+    false
   end
 end
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index ceb7fb61f2..c79de12eaf 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -5,20 +5,13 @@ require "sidekiq/api"
 require "sidekiq/testing"
 Sidekiq::Testing.disable!
 
-Sidekiq.configure_server do |config|
-  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
-end
-
-Sidekiq.configure_client do |config|
-  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
-end
-
 module SidekiqJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sidekiq
     unless can_run?
       puts "Cannot run integration tests for sidekiq. To be able to run integration tests for sidekiq you need to install and start redis.\n"
-      exit
+      status = ENV["CI"] ? false : true
+      exit status
     end
   end
 
@@ -58,6 +51,7 @@ module SidekiqJobsManager
         self_write.puts("TERM")
       end
 
+      require "sidekiq/cli"
       require "sidekiq/launcher"
       sidekiq = Sidekiq::Launcher.new(queues: ["integration_tests"],
                                        environment: "test",