Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/gitlab/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,17 @@ class ConnectionTimedOut < ResponseError; end
503 => ServiceUnavailable,
522 => ConnectionTimedOut
}.freeze

# Returns error class that should be raised for this response. Returns nil
# if the response status code is not 4xx or 5xx.
#
# @param [HTTParty::Response] response The response object.
# @return [Class<Error::ResponseError>, nil]
def self.klass(response)
error_klass = STATUS_MAPPINGS[response.code]
return error_klass if error_klass

ResponseError if response.server_error? || response.client_error?
end
end
end
2 changes: 1 addition & 1 deletion lib/gitlab/request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def self.decode(response)
# Checks the response code for common errors.
# Returns parsed response for successful requests.
def validate(response)
error_klass = Error::STATUS_MAPPINGS[response.code]
error_klass = Error.klass(response)
raise error_klass, response if error_klass

parsed = response.parsed_response
Expand Down
26 changes: 26 additions & 0 deletions spec/gitlab/request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,32 @@
end
end

describe 'errors' do
before do
@request.private_token = 'token'
@request.endpoint = 'https://example.com/api/v4'
@rpath = "#{@request.endpoint}/version"

allow(@request).to receive(:httparty)
end

it 'raises error for 5xx status code without special error class' do
stub_request(:get, @rpath).to_return(status: 599)

expect { @request.get('/version') }.to raise_error(Gitlab::Error::ResponseError)

expect(a_request(:get, @rpath)).to have_been_made
end

it 'raises error for 4xx status code without special error class' do
stub_request(:get, @rpath).to_return(status: 499)

expect { @request.get('/version') }.to raise_error(Gitlab::Error::ResponseError)

expect(a_request(:get, @rpath)).to have_been_made
end
end

describe 'ratelimiting' do
before do
@request.private_token = 'token'
Expand Down