diff --git a/app/validators/maintenance_tasks/run_status_validator.rb b/app/validators/maintenance_tasks/run_status_validator.rb index 143561d8..e8c4db08 100644 --- a/app/validators/maintenance_tasks/run_status_validator.rb +++ b/app/validators/maintenance_tasks/run_status_validator.rb @@ -48,9 +48,8 @@ class RunStatusValidator < ActiveModel::Validator "errored", ], # paused -> enqueued occurs when the task is resumed after being paused. - # paused -> cancelling when the user cancels the task after it is paused. # paused -> cancelled when the user cancels the task after it is paused. - "paused" => ["enqueued", "cancelling", "cancelled"], + "paused" => ["enqueued", "cancelled"], # interrupted -> running occurs when the task is resumed after being # interrupted by the job infrastructure. # interrupted -> pausing occurs when the task is paused by the user while diff --git a/test/validators/maintenance_tasks/run_status_validator_test.rb b/test/validators/maintenance_tasks/run_status_validator_test.rb index 85c5cc2b..73aaef72 100644 --- a/test/validators/maintenance_tasks/run_status_validator_test.rb +++ b/test/validators/maintenance_tasks/run_status_validator_test.rb @@ -63,7 +63,7 @@ class RunStatusValidatorTest < ActiveSupport::TestCase ) end - test "run can go from enqueued, running, interrupted, pausing, or paused to cancelling" do + test "run can go from enqueued, running, interrupted, or pausing to cancelling" do enqueued_run = Run.create!(task_name: "Maintenance::UpdatePostsTask") enqueued_run.status = :cancelling @@ -93,16 +93,8 @@ class RunStatusValidatorTest < ActiveSupport::TestCase assert pausing_run.valid? - paused_run = Run.create!( - task_name: "Maintenance::UpdatePostsTask", - status: :paused - ) - paused_run.status = :cancelling - - assert paused_run.valid? - assert_no_invalid_transitions( - [:enqueued, :running, :interrupted, :pausing, :paused], + [:enqueued, :running, :interrupted, :pausing], :cancelling ) end