From eb4245dd17ba66c0551f3d4ed841b471bcf01b91 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Tue, 26 Aug 2014 20:08:49 +0000
Subject: [ActiveJob] TestCase

---
 activejob/lib/active_job/queue_adapter.rb | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'activejob/lib/active_job/queue_adapter.rb')

diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 13c23abce4..c597093458 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -3,21 +3,28 @@ 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
+      delegate :performed_jobs, :performed_jobs=,
+               :enqueued_jobs, :enqueued_jobs=,
+               to: ActiveJob::QueueAdapters::TestAdapter
+      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 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
-- 
cgit v1.2.3


From fccf3d0b6304a7b8dacad05b63f24cdf41e652df Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Fri, 29 Aug 2014 20:11:17 +0000
Subject: [ActiveJob] TestCase

---
 activejob/lib/active_job/queue_adapter.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'activejob/lib/active_job/queue_adapter.rb')

diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index c597093458..fb54aec75e 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -6,14 +6,13 @@ module ActiveJob
     extend ActiveSupport::Concern
 
     module ClassMethods
-      delegate :performed_jobs, :performed_jobs=,
-               :enqueued_jobs, :enqueued_jobs=,
-               to: ActiveJob::QueueAdapters::TestAdapter
       mattr_reader(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter }
 
       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
-- 
cgit v1.2.3