end
[
- ['cancelled_at', Time.now, :success],
- ['state', 'Cancelled', :success],
- ['state', 'Running', :unprocessable_entity],
- ['state', 'Failed', :unprocessable_entity],
- ['state', 'Complete', :unprocessable_entity],
- [:use_action, :cancel, :success],
- ].each do |attribute, value, expected_response|
- test "cancelled job stays cancelled when updated using #{attribute} #{value}" do
+ [:put, :update, {job:{cancelled_at: Time.now}}, :success],
+ [:put, :update, {job:{cancelled_at: nil}}, :unprocessable_entity],
+ [:put, :update, {job:{state: 'Cancelled'}}, :success],
+ [:put, :update, {job:{state: 'Queued'}}, :unprocessable_entity],
+ [:put, :update, {job:{state: 'Running'}}, :unprocessable_entity],
+ [:put, :update, {job:{state: 'Failed'}}, :unprocessable_entity],
+ [:put, :update, {job:{state: 'Complete'}}, :unprocessable_entity],
+ [:post, :cancel, {}, :success],
+ ].each do |http_method, action, params, expected_response|
+ test "cancelled job stays cancelled after #{[http_method, action, params].inspect}" do
# We need to verify that "cancel" creates a trigger file, so first
# let's make sure there is no stale trigger file.
begin
end
authorize_with :active
- if attribute == :use_action
- post value, { id: jobs(:cancelled).uuid }
- else
- put :update, {
- id: jobs(:cancelled).uuid,
- job: {
- attribute => value
- }
- }
- end
+ self.send http_method, action, { id: jobs(:cancelled).uuid }.merge(params)
assert_response expected_response
- job = json_response
- assert_not_nil job['cancelled_at'], 'job cancelled again using #{attribute}=#{value} did not have cancelled_at value'
- assert_equal job['state'], 'Cancelled', 'cancelled again job state changed when updated using using #{attribute}=#{value}'
+ if expected_response == :success
+ job = json_response
+ assert_not_nil job['cancelled_at'], 'job cancelled again using #{attribute}=#{value} did not have cancelled_at value'
+ assert_equal job['state'], 'Cancelled', 'cancelled again job state changed when updated using using #{attribute}=#{value}'
+ end
+ # Verify database record still says Cancelled
+ assert_equal 'Cancelled', Job.find(jobs(:cancelled).id).state, 'job was un-cancelled'
end
end