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
1 change: 1 addition & 0 deletions app/models/solid_queue/job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class EnqueueError < StandardError; end

class << self
def enqueue_all(active_jobs)
active_jobs.each { |job| job.scheduled_at ||= Time.current }
active_jobs_by_job_id = active_jobs.index_by(&:job_id)

transaction do
Expand Down
16 changes: 16 additions & 0 deletions test/models/solid_queue/job_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,22 @@ class DiscardableNonOverlappingGroupedJob2 < NonOverlappingJob
assert_equal "enqueued inside a rolled back transaction", job.arguments.dig("arguments", 0)
end

test "enqueue_all assigns scheduled_at if missing" do
freeze_time do
active_jobs = [
AddToBufferJob.new(1),
AddToBufferJob.new(2).set(wait: 5.minutes)
]

ActiveJob.perform_all_later(active_jobs)

jobs = SolidQueue::Job.where(active_job_id: active_jobs.map(&:job_id)).order(:id)

assert_equal Time.current, jobs[0].scheduled_at
assert_equal 5.minutes.from_now, jobs[1].scheduled_at
end
end

private
def assert_ready(&block)
assert_job_counts(ready: 1, &block)
Expand Down