aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-03 17:39:50 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-03 17:39:50 -0300
commitb4b29536e59f3e9e71155ed60148fe1f1e345283 (patch)
tree2706579c4c7ddd9d0c44245927dfa49842d50a2b /activejob/test
parent982db48bcbf28057dc178f86b1d2c77f2dc28c15 (diff)
parentfdfca02c304d809aac53ebf8094b237d0ba6415e (diff)
downloadrails-b4b29536e59f3e9e71155ed60148fe1f1e345283.tar.gz
rails-b4b29536e59f3e9e71155ed60148fe1f1e345283.tar.bz2
rails-b4b29536e59f3e9e71155ed60148fe1f1e345283.zip
Merge pull request #19498 from chanks/activejob-que-remove-named-queues
ActiveJob: Stop using Que's named queues.
Diffstat (limited to 'activejob/test')
-rw-r--r--activejob/test/support/que/inline.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb
index 2e210acb6b..0232da1370 100644
--- a/activejob/test/support/que/inline.rb
+++ b/activejob/test/support/que/inline.rb
@@ -3,7 +3,11 @@ require 'que'
Que::Job.class_eval do
class << self; alias_method :original_enqueue, :enqueue; end
def self.enqueue(*args)
- args.pop if args.last.is_a?(Hash)
+ if args.last.is_a?(Hash)
+ options = args.pop
+ options.delete(:run_at)
+ args << options unless options.empty?
+ end
self.run(*args)
end
end