kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Return no_content from prometheus API empty response

This commit is contained in:
Simon Knox 2019-06-05 17:12:10 +10:00 committed by syasonik
parent e53f475e4a
commit 8980b71490
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/environments/prometheus_api_controller.rb
View File

@ -13,7 +13,7 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon
).execute ).execute
if result.nil? if result.nil?
return render status: :accepted, json: { return render status: :no_content, json: {
status: _('processing'), status: _('processing'),
message: _('Not ready yet. Try again later.') message: _('Not ready yet. Try again later.')
} }

4
spec/controllers/projects/environments/prometheus_api_controller_spec.rb
View File

@ -85,12 +85,12 @@ describe Projects::Environments::PrometheusApiController do
context 'with nil result' do context 'with nil result' do
let(:service_result) { nil } let(:service_result) { nil }
it 'returns 202 accepted' do it 'returns 204 no_content' do
get :proxy, params: environment_params get :proxy, params: environment_params
expect(json_response['status']).to eq('processing') expect(json_response['status']).to eq('processing')
expect(json_response['message']).to eq('Not ready yet. Try again later.') expect(json_response['message']).to eq('Not ready yet. Try again later.')
expect(response).to have_gitlab_http_status(:accepted) expect(response).to have_gitlab_http_status(:no_content)
end end
end end