diff options
author | Simon Knox <psimyn@gmail.com> | 2019-06-05 17:12:10 +1000 |
---|---|---|
committer | syasonik <syasonik@gitlab.com> | 2019-06-06 11:43:50 +0100 |
commit | 8980b714902361edc2b0441301978d8a277c9b6e (patch) | |
tree | e53f5edf2c143589d2321420dd20290a858c5fad | |
parent | e53f475e4a6aaaee526e95c2e922e87b4ef98d32 (diff) | |
download | gitlab-ce-8980b714902361edc2b0441301978d8a277c9b6e.tar.gz |
Return no_content from prometheus API empty response
-rw-r--r-- | app/controllers/projects/environments/prometheus_api_controller.rb | 2 | ||||
-rw-r--r-- | spec/controllers/projects/environments/prometheus_api_controller_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/environments/prometheus_api_controller.rb b/app/controllers/projects/environments/prometheus_api_controller.rb index f8ef23cd83e..9c6c6513a78 100644 --- a/app/controllers/projects/environments/prometheus_api_controller.rb +++ b/app/controllers/projects/environments/prometheus_api_controller.rb @@ -13,7 +13,7 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon ).execute if result.nil? - return render status: :accepted, json: { + return render status: :no_content, json: { status: _('processing'), message: _('Not ready yet. Try again later.') } diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb index d232408b775..fdef9bc5638 100644 --- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb +++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb @@ -85,12 +85,12 @@ describe Projects::Environments::PrometheusApiController do context 'with nil result' do let(:service_result) { nil } - it 'returns 202 accepted' do + it 'returns 204 no_content' do get :proxy, params: environment_params expect(json_response['status']).to eq('processing') 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 |