aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/integration
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-04-20 08:21:15 +0930
committerMatthew Draper <matthew@trebex.net>2015-04-20 08:21:15 +0930
commit2ca8545e514d2b8ad9c1925ef5d54fe65305799c (patch)
tree9af8677f7c47ad8767c8b3e940b0920e3b08320d /activejob/test/integration
parenta2bf755c619147e46d8b1ee0ec5bd1d0b89a60d6 (diff)
downloadrails-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.
Diffstat (limited to 'activejob/test/integration')
-rw-r--r--activejob/test/integration/queuing_test.rb2
1 files changed, 0 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