Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/delayed/backend/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module ClassMethods
# :priority, :run_at, :queue, :strand, :singleton
# Example: Delayed::Job.enqueue(object, priority: 0, run_at: time, queue: queue)
def enqueue(object,
priority: default_priority,
priority: nil,
run_at: nil,
expires_at: nil,
queue: Delayed::Settings.queue,
Expand All @@ -44,6 +44,7 @@ def enqueue(object,
raise ArgumentError, "Cannot enqueue items which do not respond to perform"
end

priority ||= default_priority
strand ||= singleton if Settings.infer_strand_from_singleton

kwargs = Settings.default_job_options.merge(kwargs)
Expand Down
10 changes: 10 additions & 0 deletions spec/shared/shared_backend.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@ def no_op_callback(_); end
Delayed::Job.default_priority = 0
end

it "uses the default priority when a priority of nil is explicitly specified" do
Delayed::Job.default_priority = 0
@job = Delayed::Job.enqueue SimpleJob.new, priority: nil
expect(@job.priority).to be 0
Delayed::Job.default_priority = 10
@job = Delayed::Job.enqueue SimpleJob.new, priority: nil
expect(@job.priority).to be 10
Delayed::Job.default_priority = 0
end

it "is able to set run_at when enqueuing items" do
later = Delayed::Job.db_time_now + 5.minutes
@job = Delayed::Job.enqueue SimpleJob.new, priority: 5, run_at: later
Expand Down