Merge remote-tracking branch 'origin/master' into guides-template-inheritance

1 files changed, 19 insertions, 13 deletions

diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 13c23abce4..fb54aec75e 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -3,21 +3,27 @@ require 'active_support/core_ext/string/inflections'
 
 module ActiveJob
   module QueueAdapter
-    mattr_reader(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter }
+    extend ActiveSupport::Concern
 
-    def queue_adapter=(name_or_adapter)
-      @@queue_adapter = \
-        case name_or_adapter
-        when Symbol, String
-          load_adapter(name_or_adapter)
-        when Class
-          name_or_adapter
-        end
-    end
+    module ClassMethods
+      mattr_reader(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter }
 
-    private
-      def load_adapter(name)
-        "ActiveJob::QueueAdapters::#{name.to_s.camelize}Adapter".constantize
+      def queue_adapter=(name_or_adapter)
+        @@queue_adapter = \
+          case name_or_adapter
+          when :test
+            ActiveJob::QueueAdapters::TestAdapter.new
+          when Symbol, String
+            load_adapter(name_or_adapter)
+          when Class
+            name_or_adapter
+          end
       end
+
+      private
+        def load_adapter(name)
+          "ActiveJob::QueueAdapters::#{name.to_s.camelize}Adapter".constantize
+        end
+    end
   end
 end
\ No newline at end of file