diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:08:05 +0000 |
commit | abae8f34f377519946a91101ef7abf504454531c (patch) | |
tree | 359fab0082860b6850d4a0a492b8f12eb3d4eb0b /spec/controllers/metrics_controller_spec.rb | |
parent | 580622bdb3c762a8e89facd8a3946881ee480442 (diff) | |
download | gitlab-ce-abae8f34f377519946a91101ef7abf504454531c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/metrics_controller_spec.rb')
-rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 331eafba0d3..75509cc509f 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -33,7 +33,7 @@ describe MetricsController, :request_store do it 'returns prometheus metrics' do get :index - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) expect(response.body).to match(/^prometheus_counter 1$/) end @@ -45,7 +45,7 @@ describe MetricsController, :request_store do it 'returns proper response' do get :index - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) expect(response.body).to eq("# Metrics are disabled, see: http://test.host/help/administration/monitoring/prometheus/gitlab_metrics#gitlab-prometheus-metrics\n") end end @@ -75,7 +75,7 @@ describe MetricsController, :request_store do it 'returns the expected error response' do get :index - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end end |