From 2ca8545e514d2b8ad9c1925ef5d54fe65305799c Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Mon, 20 Apr 2015 08:21:15 +0930 Subject: Fix sidekiq test order dependency Requiring sidekiq/testing changes stuff, so we need to counteract that after we do so. And given its potential to confuse things, let's do it up front, at a predictable point. --- activejob/test/support/integration/adapters/sidekiq.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'activejob/test/support/integration/adapters') diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index dd24b3abf2..7378591cbc 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -1,5 +1,8 @@ require 'sidekiq/api' +require 'sidekiq/testing' +Sidekiq::Testing.disable! + module SidekiqJobsManager def setup -- cgit v1.2.3