jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jobs: fix failures in /jobs controller.

Browse Source 
Fix errors with searching for and retrying jobs on the /jobs page caused
by the upgrade to GoodJob 3.0.
This commit is contained in:
evazion
2022-08-23 17:27:23 -05:00
parent df2d13d42e
commit c8917684b8
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/factories/good_job.rb
View File

@@ -1,5 +1,5 @@
FactoryBot.define do
factory :good_job, class: GoodJob::ActiveJobJob do
factory :good_job, class: GoodJob::Job do
transient do
job { VacuumDatabaseJob.new }
end

11
test/functional/jobs_controller_test.rb
View File

@@ -12,11 +12,16 @@ class JobsControllerTest < ActionDispatch::IntegrationTest
get jobs_path
assert_response :success
end
should respond_to_search(status: "running").with { [] }
should respond_to_search(status: "queued").with { [@job] }
should respond_to_search(status: "finished").with { [] }
should respond_to_search(status: "discarded").with { [] }
end
context "cancel action" do
should "work" do
GoodJob::ActiveJobJob.any_instance.stubs(:status).returns(:queued)
GoodJob::Job.any_instance.stubs(:status).returns(:queued)
put_auth cancel_job_path(@job), @user, xhr: true
assert_response :success
end
@@ -24,8 +29,8 @@ class JobsControllerTest < ActionDispatch::IntegrationTest
context "retry action" do
should "work" do
@job.discard_job("Canceled")
@job.head_execution.active_job.class.stubs(:queue_adapter).returns(GoodJob::Adapter.new)
GoodJob::ActiveJobJob.any_instance.stubs(:status).returns(:discarded)
put_auth retry_job_path(@job), @user, xhr: true
assert_response :success
end
@@ -33,7 +38,7 @@ class JobsControllerTest < ActionDispatch::IntegrationTest
context "run action" do
should "work" do
GoodJob::ActiveJobJob.any_instance.stubs(:status).returns(:queued)
GoodJob::Job.any_instance.stubs(:status).returns(:queued)
put_auth run_job_path(@job), @user, xhr: true
assert_response :success
end