merge master

4 files changed, 39 insertions, 13 deletions

diff --git a/test/adapters/que.rb b/test/adapters/que.rb
new file mode 100644
index 0000000000..640061bf54
--- /dev/null
+++ b/test/adapters/que.rb
@@ -0,0 +1,2 @@
+ActiveJob::Base.queue_adapter = :que
+Que.mode = :sync
diff --git a/test/adapters/sneakers.rb b/test/adapters/sneakers.rb
new file mode 100644
index 0000000000..204166a700
--- /dev/null
+++ b/test/adapters/sneakers.rb
@@ -0,0 +1,2 @@
+require 'support/sneakers/inline'
+ActiveJob::Base.queue_adapter = :sneakers
diff --git a/test/cases/adapter_test.rb b/test/cases/adapter_test.rb
index 05efdc33e9..1a08fa2617 100644
--- a/test/cases/adapter_test.rb
+++ b/test/cases/adapter_test.rb
@@ -1,36 +1,46 @@
 require 'helper'
 
 class AdapterTest < ActiveSupport::TestCase
-  def setup
-    @old_adapter = ActiveJob::Base.queue_adapter
-  end
+  setup    { @old_adapter = ActiveJob::Base.queue_adapter }
+  teardown { ActiveJob::Base.queue_adapter = @old_adapter }
 
   test 'should load inline adapter' do
     ActiveJob::Base.queue_adapter = :inline
     assert_equal ActiveJob::QueueAdapters::InlineAdapter, ActiveJob::Base.queue_adapter
   end
 
-  test 'should load resque adapter' do
+  test 'should load Delayed Job adapter' do
+    ActiveJob::Base.queue_adapter = :delayed_job
+    assert_equal ActiveJob::QueueAdapters::DelayedJobAdapter, ActiveJob::Base.queue_adapter
+  end
+
+  test 'should load Que adapter' do
+    ActiveJob::Base.queue_adapter = :que
+    assert_equal ActiveJob::QueueAdapters::QueAdapter, ActiveJob::Base.queue_adapter
+  end
+
+  test 'should load Queue Classic adapter' do
+    ActiveJob::Base.queue_adapter = :queue_classic
+    assert_equal ActiveJob::QueueAdapters::QueueClassicAdapter, ActiveJob::Base.queue_adapter
+  end
+
+  test 'should load Resque adapter' do
     ActiveJob::Base.queue_adapter = :resque
     assert_equal ActiveJob::QueueAdapters::ResqueAdapter, ActiveJob::Base.queue_adapter
   end
 
-  test 'should load sidekiq adapter' do
+  test 'should load Sidekiq adapter' do
     ActiveJob::Base.queue_adapter = :sidekiq
     assert_equal ActiveJob::QueueAdapters::SidekiqAdapter, ActiveJob::Base.queue_adapter
   end
 
-  test 'should load sucker punch adapter' do
+  test 'should load Sucker Punch adapter' do
     ActiveJob::Base.queue_adapter = :sucker_punch
     assert_equal ActiveJob::QueueAdapters::SuckerPunchAdapter, ActiveJob::Base.queue_adapter
   end
 
-  test 'should load delayed_job adapter' do
-    ActiveJob::Base.queue_adapter = :delayed_job
-    assert_equal ActiveJob::QueueAdapters::DelayedJobAdapter, ActiveJob::Base.queue_adapter
-  end
-
-  def teardown
-    ActiveJob::Base.queue_adapter = @old_adapter
+  test 'should load Sneakers adapter' do
+    ActiveJob::Base.queue_adapter = :sneakers
+    assert_equal ActiveJob::QueueAdapters::SneakersAdapter, ActiveJob::Base.queue_adapter
   end
 end
diff --git a/test/support/sneakers/inline.rb b/test/support/sneakers/inline.rb
new file mode 100644
index 0000000000..16d9b830fa
--- /dev/null
+++ b/test/support/sneakers/inline.rb
@@ -0,0 +1,12 @@
+require 'sneakers'
+
+module Sneakers
+  module Worker
+    module ClassMethods
+      def enqueue(msg)
+        worker = self.new(nil, nil, {})
+        worker.work(*msg)
+      end
+    end
+  end
+end