From fb26645c1ed9d3b74ec421839c9732706f74f5c0 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Wed, 11 Mar 2015 14:57:13 -0700
Subject: `ActiveJob::QueueAdapters::*` are no longer singletons

---
 .../lib/active_job/queue_adapters/test_adapter.rb  | 68 +++++++++++-----------
 1 file changed, 33 insertions(+), 35 deletions(-)

(limited to 'activejob/lib/active_job/queue_adapters/test_adapter.rb')

diff --git a/activejob/lib/active_job/queue_adapters/test_adapter.rb b/activejob/lib/active_job/queue_adapters/test_adapter.rb
index fd7c0b207a..9b7b7139f4 100644
--- a/activejob/lib/active_job/queue_adapters/test_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/test_adapter.rb
@@ -10,52 +10,50 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :test
     class TestAdapter
-      class << self
-        attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter)
-        attr_writer(:enqueued_jobs, :performed_jobs)
+      attr_accessor(:perform_enqueued_jobs, :perform_enqueued_at_jobs, :filter)
+      attr_writer(:enqueued_jobs, :performed_jobs)
 
-        # Provides a store of all the enqueued jobs with the TestAdapter so you can check them.
-        def enqueued_jobs
-          @enqueued_jobs ||= []
-        end
+      # Provides a store of all the enqueued jobs with the TestAdapter so you can check them.
+      def enqueued_jobs
+        @enqueued_jobs ||= []
+      end
 
-        # Provides a store of all the performed jobs with the TestAdapter so you can check them.
-        def performed_jobs
-          @performed_jobs ||= []
-        end
+      # Provides a store of all the performed jobs with the TestAdapter so you can check them.
+      def performed_jobs
+        @performed_jobs ||= []
+      end
 
-        def enqueue(job) #:nodoc:
-          return if filtered?(job)
+      def enqueue(job) #:nodoc:
+        return if filtered?(job)
 
-          job_data = job_to_hash(job)
-          enqueue_or_perform(perform_enqueued_jobs, job, job_data)
-        end
+        job_data = job_to_hash(job)
+        enqueue_or_perform(perform_enqueued_jobs, job, job_data)
+      end
 
-        def enqueue_at(job, timestamp) #:nodoc:
-          return if filtered?(job)
+      def enqueue_at(job, timestamp) #:nodoc:
+        return if filtered?(job)
 
-          job_data = job_to_hash(job, at: timestamp)
-          enqueue_or_perform(perform_enqueued_at_jobs, job, job_data)
-        end
+        job_data = job_to_hash(job, at: timestamp)
+        enqueue_or_perform(perform_enqueued_at_jobs, job, job_data)
+      end
 
-        private
+      private
 
-        def job_to_hash(job, extras = {})
-          { job: job.class, args: job.serialize.fetch('arguments'), queue: job.queue_name }.merge!(extras)
-        end
+      def job_to_hash(job, extras = {})
+        { job: job.class, args: job.serialize.fetch('arguments'), queue: job.queue_name }.merge!(extras)
+      end
 
-        def enqueue_or_perform(perform, job, job_data)
-          if perform
-            performed_jobs << job_data
-            Base.execute job.serialize
-          else
-            enqueued_jobs << job_data
-          end
+      def enqueue_or_perform(perform, job, job_data)
+        if perform
+          performed_jobs << job_data
+          Base.execute job.serialize
+        else
+          enqueued_jobs << job_data
         end
+      end
 
-        def filtered?(job)
-          filter && !Array(filter).include?(job.class)
-        end
+      def filtered?(job)
+        filter && !Array(filter).include?(job.class)
       end
     end
   end
-- 
cgit v1.2.3