aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib/active_job/queue_adapter.rb
diff options
context:
space:
mode:
authorCristian Bica <cristian.bica@gmail.com>2014-12-30 17:53:42 +0200
committerCristian Bica <cristian.bica@gmail.com>2014-12-30 17:53:42 +0200
commit8a73f4b5b9d342a45b3c8e29a13142adbca9ab21 (patch)
tree7330f4490ec4b7dd9cd880d1187ffb41fb4f0da6 /activejob/lib/active_job/queue_adapter.rb
parent0c070ae568767a2c8e9bdec49ab3a1a24f113382 (diff)
downloadrails-8a73f4b5b9d342a45b3c8e29a13142adbca9ab21.tar.gz
rails-8a73f4b5b9d342a45b3c8e29a13142adbca9ab21.tar.bz2
rails-8a73f4b5b9d342a45b3c8e29a13142adbca9ab21.zip
ActiveJob testing improvements
1. The :test adapter wasn't going through a full cycle of serialize/deserialize when performing jobs. Now it does 2. Regular AJ tests were not run for the :test adapter. Now they are 3. ActiveJob::TestHelper uses assert_valid_keys but doesn’t requires the file that implements that method. Now it does
Diffstat (limited to 'activejob/lib/active_job/queue_adapter.rb')
-rw-r--r--activejob/lib/active_job/queue_adapter.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 85d7c44bb8..d48d56e1da 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -2,7 +2,7 @@ require 'active_job/queue_adapters/inline_adapter'
require 'active_support/core_ext/string/inflections'
module ActiveJob
- # The <tt>ActionJob::QueueAdapter</tt> module is used to load the
+ # The <tt>ActionJob::QueueAdapter</tt> module is used to load the
# correct adapter. The default queue adapter is the :inline queue.
module QueueAdapter #:nodoc:
extend ActiveSupport::Concern
@@ -21,8 +21,8 @@ module ActiveJob
ActiveJob::QueueAdapters::TestAdapter.new
when Symbol, String
load_adapter(name_or_adapter)
- when Class
- name_or_adapter
+ else
+ name_or_adapter if name_or_adapter.respond_to?(:enqueue)
end
end