From b94036590d4741fad36b2ceb707b0f3c9da87c4f Mon Sep 17 00:00:00 2001 From: Mirko Mignini Date: Wed, 15 Mar 2017 13:34:50 +0100 Subject: [PATCH] Workflow or item not found now return 404 --- lib/scriptoria-core/application.rb | 4 ++-- spec/requests/v1/workflow_cancel_spec.rb | 4 ++-- spec/requests/v1/workitem_proceed_spec.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/scriptoria-core/application.rb b/lib/scriptoria-core/application.rb index abe068a..91028b7 100644 --- a/lib/scriptoria-core/application.rb +++ b/lib/scriptoria-core/application.rb @@ -50,7 +50,7 @@ class Application < Grape::API end rescue_from Workflow::NotFoundError do |e| - error!('workflow_id not found', 400) + error!('workflow_id not found', 404) end post :cancel do @@ -69,7 +69,7 @@ class Application < Grape::API end rescue_from Workitem::NotFoundError do |e| - error!('workitem_id not found', 400) + error!('workitem_id not found', 404) end rescue_from Workitem::WorkflowMismatchError do |e| diff --git a/spec/requests/v1/workflow_cancel_spec.rb b/spec/requests/v1/workflow_cancel_spec.rb index a766d16..9a29fa1 100644 --- a/spec/requests/v1/workflow_cancel_spec.rb +++ b/spec/requests/v1/workflow_cancel_spec.rb @@ -21,12 +21,12 @@ end context "validations" do - it "returns an error if the workflow does exist" do + it "returns an error if the workflow does not exist" do allow(ScriptoriaCore::Workflow).to receive(:cancel!).and_raise(ScriptoriaCore::Workflow::NotFoundError) post '/v1/workflows/1234/cancel' - expect(response.status).to eq 400 + expect(response.status).to eq 404 expect(response.body).to eq '{"error":"workflow_id not found"}' end end diff --git a/spec/requests/v1/workitem_proceed_spec.rb b/spec/requests/v1/workitem_proceed_spec.rb index b459369..093ef9e 100644 --- a/spec/requests/v1/workitem_proceed_spec.rb +++ b/spec/requests/v1/workitem_proceed_spec.rb @@ -56,7 +56,7 @@ } } - expect(response.status).to eq 400 + expect(response.status).to eq 404 expect(response.body).to eq '{"error":"workitem_id not found"}' end