1 files changed, 3 insertions, 6 deletions
diff --git a/lib/active_job/base.rb b/lib/active_job/base.rb
index 86008d3c94..d3b0fcffa8 100644
--- a/lib/active_job/base.rb
+++ b/lib/active_job/base.rb
@@ -1,9 +1,11 @@
+require 'active_job/queue_adapter'
 require 'active_job/queue_adapters/inline_adapter'
 require 'active_support/core_ext/string/inflections'
 
 module ActiveJob
   class Base
-    cattr_accessor(:queue_adapter)   { ActiveJob::QueueAdapters::InlineAdapter }
+    extend QueueAdapter
+
     cattr_accessor(:queue_base_name) { "active_jobs" }
     cattr_accessor(:queue_name)      { queue_base_name }
 
@@ -15,11 +17,6 @@ module ActiveJob
       def queue_as(part_name)
         self.queue_name = "#{queue_base_name}_#{part_name}"
       end
-
-      def adapter=(adapter_name)
-        require "active_job/queue_adapters/#{adapter_name}_adapter"
-        ActiveJob::Base.queue_adapter = "ActiveJob::QueueAdapters::#{adapter_name.to_s.camelize}Adapter".constantize
-      end
     end
   end
 end
 \ No newline at end of file