Skip to content

Fix #duration when #scheduled_at is nil #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix #duration when #scheduled_at is nil #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f01e54
Fix #duration when #scheduled_at is not set
ric2b Oct 19, 2025
edea17f
Update job_proxy_test.rb
ric2b Oct 19, 2025
42a8901
Rubocop fix
ric2b Oct 30, 2025
398b43d
Add assertion to ensure the scenario is correctly setup
ric2b Oct 30, 2025
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
2 changes: 1 addition & 1 deletion lib/active_job/job_proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def perform_now
end

def duration
finished_at - scheduled_at
finished_at - (scheduled_at || enqueued_at)
end

ActiveJob::JobsRelation::STATUSES.each do |status|
Expand Down
9 changes: 9 additions & 0 deletions test/active_job/job_proxy_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,13 @@ class ActiveJob::JobProxyTest < ActiveSupport::TestCase
job_proxy = ActiveJob::JobProxy.new(job.serialize)
assert_instance_of DummyJob, ActiveJob::Base.deserialize(job_proxy.serialize)
end

test "#duration does not break if scheduled_at is not set" do
job = DummyJob.new(123)
job_proxy = ActiveJob::JobProxy.new(job.serialize)
job_proxy.finished_at = job_proxy.enqueued_at + 5.seconds

assert_nil job_proxy.scheduled_at
assert_equal 5.seconds, job_proxy.duration
end
end