9 files changed, 96 insertions, 8 deletions
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index f0c710f9ed..6d75ae9a7c 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -2,6 +2,6 @@ require 'helper'
 
 class AdapterTest < ActiveSupport::TestCase
   test "should load #{ENV['AJ_ADAPTER']} adapter" do
-    assert_equal "active_job/queue_adapters/#{ENV['AJ_ADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
+    assert_equal "active_job/queue_adapters/#{ENV['AJ_ADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.class.name
   end
 end
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index 64aae00441..b18be553ec 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -6,7 +6,7 @@ require 'jobs/logging_job'
 require 'jobs/nested_job'
 require 'models/person'
 
-class AdapterTest < ActiveSupport::TestCase
+class LoggingTest < ActiveSupport::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
   include ActiveSupport::Logger::Severity
 
diff --git a/activejob/test/cases/queue_adapter_test.rb b/activejob/test/cases/queue_adapter_test.rb
new file mode 100644
index 0000000000..fb3fdc392f
--- /dev/null
+++ b/activejob/test/cases/queue_adapter_test.rb
@@ -0,0 +1,56 @@
+require 'helper'
+
+module ActiveJob
+  module QueueAdapters
+    class StubOneAdapter
+      def enqueue(*); end
+      def enqueue_at(*); end
+    end
+
+    class StubTwoAdapter
+      def enqueue(*); end
+      def enqueue_at(*); end
+    end
+  end
+end
+
+class QueueAdapterTest < ActiveJob::TestCase
+  test 'should forbid nonsense arguments' do
+    assert_raises(ArgumentError) { ActiveJob::Base.queue_adapter = Mutex }
+    assert_raises(ArgumentError) { ActiveJob::Base.queue_adapter = Mutex.new }
+  end
+
+  test 'should warn on passing an adapter class' do
+    klass = Class.new do
+      def self.name
+        'fake'
+      end
+
+      def enqueue(*); end
+      def enqueue_at(*); end
+    end
+
+    assert_deprecated { ActiveJob::Base.queue_adapter = klass }
+  end
+
+  test 'should allow overriding the queue_adapter at the child class level without affecting the parent or its sibling' do
+    base_queue_adapter = ActiveJob::Base.queue_adapter
+
+    child_job_one = Class.new(ActiveJob::Base)
+    child_job_one.queue_adapter = :stub_one
+
+    assert_not_equal ActiveJob::Base.queue_adapter, child_job_one.queue_adapter
+    assert_kind_of ActiveJob::QueueAdapters::StubOneAdapter, child_job_one.queue_adapter
+
+    child_job_two = Class.new(ActiveJob::Base)
+    child_job_two.queue_adapter = :stub_two
+
+    assert_kind_of ActiveJob::QueueAdapters::StubTwoAdapter, child_job_two.queue_adapter
+    assert_kind_of ActiveJob::QueueAdapters::StubOneAdapter, child_job_one.queue_adapter, "child_job_one's queue adapter should remain unchanged"
+    assert_equal base_queue_adapter, ActiveJob::Base.queue_adapter, "ActiveJob::Base's queue adapter should remain unchanged"
+
+    child_job_three = Class.new(ActiveJob::Base)
+
+    assert_not_nil child_job_three.queue_adapter
+  end
+end
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
index 7d1702990e..0a3a20d5a0 100644
--- a/activejob/test/cases/test_case_test.rb
+++ b/activejob/test/cases/test_case_test.rb
@@ -4,11 +4,20 @@ require 'jobs/logging_job'
 require 'jobs/nested_job'
 
 class ActiveJobTestCaseTest < ActiveJob::TestCase
+  # this tests that this job class doesn't get its adapter set.
+  # that's the correct behaviour since we don't want to break
+  # the `class_attribute` inheritence
+  class TestClassAttributeInheritenceJob < ActiveJob::Base
+    def self.queue_adapter=(*)
+      raise 'Attemping to break `class_attribute` inheritence, bad!'
+    end
+  end
+
   def test_include_helper
     assert_includes self.class.ancestors, ActiveJob::TestHelper
   end
 
   def test_set_test_adapter
-    assert_equal ActiveJob::QueueAdapters::TestAdapter, self.queue_adapter
+    assert_kind_of ActiveJob::QueueAdapters::TestAdapter, self.queue_adapter
   end
 end
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 58de2f2588..19a2820a6e 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -199,6 +199,14 @@ class EnqueuedJobsTest < ActiveJob::TestCase
 end
 
 class PerformedJobsTest < ActiveJob::TestCase
+  def test_performed_enqueue_jobs_with_only_option_doesnt_leak_outside_the_block
+    assert_equal nil, queue_adapter.filter
+    perform_enqueued_jobs only: HelloJob do
+      assert_equal HelloJob, queue_adapter.filter
+    end
+    assert_equal nil, queue_adapter.filter
+  end
+
   def test_assert_performed_jobs
     assert_nothing_raised do
       assert_performed_jobs 1 do
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 38874b51a8..af19a92118 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -1,5 +1,6 @@
 require 'helper'
 require 'jobs/logging_job'
+require 'jobs/hello_job'
 require 'active_support/core_ext/numeric/time'
 
 class QueuingTest < ActiveSupport::TestCase
@@ -23,6 +24,18 @@ class QueuingTest < ActiveSupport::TestCase
     end
   end
 
+  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
+      assert_equal "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper", hash['class']
+      assert_equal "HelloJob", hash['wrapped']
+    end
+  end
+
   test 'should not run job enqueued in the future' do
     begin
       TestJob.set(wait: 10.minutes).perform_later @id
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index 3a5b66a057..256ddb3cf3 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -3,7 +3,7 @@ module QuJobsManager
     require 'qu-rails'
     require 'qu-redis'
     ActiveJob::Base.queue_adapter = :qu
-    ENV['REDISTOGO_URL'] = "tcp://127.0.0.1:6379/12"
+    ENV['REDISTOGO_URL'] = "redis://127.0.0.1:6379/12"
     backend = Qu::Backend::Redis.new
     backend.namespace = "active_jobs_int_test"
     Qu.backend  = backend
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 038473ccdc..f522b2711f 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,6 +1,7 @@
 module QueueClassicJobsManager
   def setup
     ENV['QC_DATABASE_URL'] ||= 'postgres:///active_jobs_qc_int_test'
+    ENV['QC_RAILS_DATABASE'] = 'false'
     ENV['QC_LISTEN_TIME']    = "0.5"
     uri = URI.parse(ENV['QC_DATABASE_URL'])
     user = uri.user||ENV['USER']
@@ -20,7 +21,8 @@ module QueueClassicJobsManager
   end
 
   def start_workers
-    QC::Conn.disconnect
+    QC.default_conn_adapter.disconnect
+    QC.default_conn_adapter = nil
     @pid = fork do
       worker = QC::Worker.new(q_name: 'integration_tests')
       worker.start
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index ee2f6aebea..bed28b2900 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -5,7 +5,7 @@ module TestCaseHelpers
   extend ActiveSupport::Concern
 
   included do
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     setup do
       clear_jobs
@@ -27,8 +27,8 @@ module TestCaseHelpers
       jobs_manager.clear_jobs
     end
 
-    def adapter_is?(adapter)
-      ActiveJob::Base.queue_adapter.name.split("::").last.gsub(/Adapter$/, '').underscore==adapter.to_s
+    def adapter_is?(adapter_class_symbol)
+      ActiveJob::Base.queue_adapter.class.name.split("::").last.gsub(/Adapter$/, '').underscore == adapter_class_symbol.to_s
     end
 
     def wait_for_jobs_to_finish_for(seconds=60)