suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize error handling for RemoveLog service endpoints

Browse Source 
Return status 409 for errors
This commit is contained in:
Hiro Asari 2014-06-11 13:51:47 -04:00
parent 1cf298464a
commit 4a3807b21a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/travis/api/app/endpoint/jobs.rb
View File

@ -64,7 +64,7 @@ class Travis::Api::App
end end
end end
patch '/:id/log', scope: :private do patch '/:id/log', scope: :private do |id|
# PATCH method for `RemoveLog` service, since we are replacing log content # PATCH method for `RemoveLog` service, since we are replacing log content
service = self.service(:remove_log, params) service = self.service(:remove_log, params)
begin begin
@ -72,7 +72,10 @@ class Travis::Api::App
rescue Travis::AuthorizationDenied => e rescue Travis::AuthorizationDenied => e
status 401 status 401
{ error: { message: e.message } } { error: { message: e.message } }
rescue Travis::JobUnfinished, Travis::LogAlreadyRemoved => e rescue Travis::JobUnfinished => jue
status 409
{ error: { message: "Job #{id} is not finished" } }
rescue Travis::LogAlreadyRemoved => e
status 409 status 409
{ error: { message: e.message } } { error: { message: e.message } }
end end

5
lib/travis/api/app/endpoint/logs.rb
View File

@ -19,8 +19,11 @@ class Travis::Api::App
status 401 status 401
{ error: { message: ade.message } } { error: { message: ade.message } }
rescue Travis::JobUnfinished => jue rescue Travis::JobUnfinished => jue
status 422 status 409
{ error: { message: "Job #{id} is not finished" } } { error: { message: "Job #{id} is not finished" } }
rescue Travis::LogAlreadyRemoved => e
status 409
{ error: { message: e.message } }
rescue => e rescue => e
status 500 status 500
{ error: { message: "Unexpected error occurred: #{e.message}" } } { error: { message: "Unexpected error occurred: #{e.message}" } }

4
spec/unit/endpoint/logs_spec.rb
View File

@ -25,12 +25,12 @@ describe Travis::Api::App::Endpoint::Logs do
end end
context 'job is still running' do context 'job is still running' do
it 'returns status 422' do it 'returns status 409' do
job.stubs(:finished?).returns false job.stubs(:finished?).returns false
user.stubs(:permission?).with(:push, anything).returns true user.stubs(:permission?).with(:push, anything).returns true
response = patch("/logs/#{job.id}") response = patch("/logs/#{job.id}")
response.status.should == 422 response.status.should == 409
JSON.parse(response.body)['error']['message'].should =~ Regexp.new("Job .*is (not |un)finished") JSON.parse(response.body)['error']['message'].should =~ Regexp.new("Job .*is (not |un)finished")
end end
end end