From d1fc0a5eb286600abf8505516897b96c2f1ef3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 10 Oct 2016 15:00:28 -0300
Subject: [PATCH] Removed deprecated support to passing the adapter class to
 .queue_adapter

---
 activejob/CHANGELOG.md                     |  4 ++++
 activejob/lib/active_job/queue_adapter.rb  | 10 ----------
 activejob/test/cases/queue_adapter_test.rb | 13 -------------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 1142c84d33..5e8d8cb5c9 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed deprecated support to passing the adapter class to `.queue_adapter`.
+
+    *Rafael Mendonça França*
+
 *   Removed deprecated `#original_exception` in `ActiveJob::DeserializationError`.
 
     *Rafael Mendonça França*
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 7f9a2da4b0..2e9f1e61be 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -37,12 +37,6 @@ module ActiveJob
           else
             if queue_adapter?(name_or_adapter_or_class)
               name_or_adapter_or_class
-            elsif queue_adapter_class?(name_or_adapter_or_class)
-              ActiveSupport::Deprecation.warn "Passing an adapter class is deprecated " \
-                "and will be removed in Rails 5.1. Please pass an adapter name " \
-                "(.queue_adapter = :#{name_or_adapter_or_class.name.demodulize.remove('Adapter').underscore}) " \
-                "or an instance (.queue_adapter = #{name_or_adapter_or_class.name}.new) instead."
-              name_or_adapter_or_class.new
             else
               raise ArgumentError
             end
@@ -54,10 +48,6 @@ module ActiveJob
         def queue_adapter?(object)
           QUEUE_ADAPTER_METHODS.all? { |meth| object.respond_to?(meth) }
         end
-
-        def queue_adapter_class?(object)
-          object.is_a?(Class) && QUEUE_ADAPTER_METHODS.all? { |meth| object.public_method_defined?(meth) }
-        end
     end
   end
 end
diff --git a/activejob/test/cases/queue_adapter_test.rb b/activejob/test/cases/queue_adapter_test.rb
index dc862450aa..f1e0cf78ad 100644
--- a/activejob/test/cases/queue_adapter_test.rb
+++ b/activejob/test/cases/queue_adapter_test.rb
@@ -20,19 +20,6 @@ class QueueAdapterTest < ActiveJob::TestCase
     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