Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integration

Fix Sidekiq ActiveJob integration setup Conflicts: activejob/test/support/integration/adapters/sidekiq.rb
2014-12-04 18:24:23 -02:00 · 2014-12-04 18:24:23 -02:00 · 191ea4b85b
commit 191ea4b85b
parent 2673a359e1 2fa4cbeebd
1 changed files with 2 additions and 1 deletions
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@ -48,7 +48,8 @@ def stop_workers

  def can_run?
    begin
-      Sidekiq.redis(&:connect)
+      Sidekiq.redis(&:info)
+      Sidekiq.logger = nil
    rescue
      return false
    end