Skip to content
Snippets Groups Projects
Commit d2161350 authored by Chantal Rollison's avatar Chantal Rollison
Browse files

Handled exception during file upload

parent c691e07a
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -53,6 +53,8 @@ module UploadsActions
maximum_size: Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i)
 
render json: authorized
rescue SocketError
render json: "Error uploading file", status: :internal_server_error
end
 
private
Loading
Loading
---
title: Handles exception during file upload - replaces the stack trace with a small
error message.
merge_request: 21528
author:
type: fixed
Loading
Loading
@@ -18,6 +18,20 @@ describe Projects::UploadsController do
end
end
 
context "when exception occurs" do
before do
allow(FileUploader).to receive(:workhorse_authorize).and_raise(SocketError.new)
sign_in(create(:user))
end
it "responds with status internal_server_error" do
post_authorize
expect(response).to have_gitlab_http_status(500)
expect(response.body).to eq('Error uploading file')
end
end
def post_authorize(verified: true)
request.headers.merge!(workhorse_internal_api_request_header) if verified
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment