Merge pull request rails#47995 from Mangara/mangara-support-class-queue-adapters

Fix name extraction for module queue adapters

Author: byroot

activejob/lib/active_job/queue_adapter.rb

@@ -43,7 +43,8 @@ def queue_adapter=(name_or_adapter)
           assign_adapter(name_or_adapter.to_s, queue_adapter)
         else
           if queue_adapter?(name_or_adapter)
-            adapter_name = "#{name_or_adapter.class.name.demodulize.remove('Adapter').underscore}"
+            adapter_class = name_or_adapter.is_a?(Module) ? name_or_adapter : name_or_adapter.class
+            adapter_name = "#{adapter_class.name.demodulize.remove('Adapter').underscore}"
             assign_adapter(adapter_name, name_or_adapter)
           else
             raise ArgumentError

activejob/test/cases/queue_adapter_test.rb

@@ -50,4 +50,23 @@ class QueueAdapterTest < ActiveJob::TestCase
 
     assert_not_nil child_job_three.queue_adapter
   end
+
+  test "should extract a reasonable name from a class instance" do
+    child_job = Class.new(ActiveJob::Base)
+    child_job.queue_adapter = ActiveJob::QueueAdapters::StubOneAdapter.new
+    assert_equal "stub_one", child_job.queue_adapter_name
+  end
+
+  module StubThreeAdapter
+    class << self
+      def enqueue(*); end
+      def enqueue_at(*); end
+    end
+  end
+
+  test "should extract a reasonable name from a class or module" do
+    child_job = Class.new(ActiveJob::Base)
+    child_job.queue_adapter = StubThreeAdapter
+    assert_equal "stub_three", child_job.queue_adapter_name
+  end
 end