diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-04-20 08:21:15 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-04-20 08:21:15 +0930 |
| commit | 2ca8545e514d2b8ad9c1925ef5d54fe65305799c (patch) | |
| tree | 9af8677f7c47ad8767c8b3e940b0920e3b08320d | |
| parent | a2bf755c619147e46d8b1ee0ec5bd1d0b89a60d6 (diff) | |
| download | rails-2ca8545e514d2b8ad9c1925ef5d54fe65305799c.tar.gz rails-2ca8545e514d2b8ad9c1925ef5d54fe65305799c.tar.bz2 rails-2ca8545e514d2b8ad9c1925ef5d54fe65305799c.zip | |
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.
| -rw-r--r-- | activejob/test/integration/queuing_test.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb index af19a92118..3075df607b 100644 --- a/activejob/test/integration/queuing_test.rb +++ b/activejob/test/integration/queuing_test.rb @@ -26,8 +26,6 @@ class QueuingTest < ActiveSupport::TestCase test 'should supply a wrapped class name to Sidekiq' do skip unless adapter_is?(:sidekiq) - require 'sidekiq/testing' - Sidekiq::Testing.fake! do ::HelloJob.perform_later hash = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.jobs.first 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 |