diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2018-07-12 11:50:37 +0100 |
---|---|---|
committer | Andrew Newdigate <andrew@gitlab.com> | 2018-07-12 11:50:37 +0100 |
commit | 785b7438b9643c10b99b2f61d35e4faaf39efaa7 (patch) | |
tree | 863328e536cf4854eee61b6eedd58d6b196475d9 | |
parent | ce42b743ad9d51176721f6e21e08ed1189047de4 (diff) | |
download | gitlab-ce-an/no-healthcheck-until-brooklyn.tar.gz |
Better namingan/no-healthcheck-until-brooklyn
-rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 295db7f2c7f..c7c83369d7c 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -15,7 +15,7 @@ describe MetricsController do allow(Prometheus::Client.configuration).to receive(:multiprocess_files_dir).and_return(metrics_multiproc_dir) allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true) allow(Settings.monitoring).to receive(:ip_whitelist).and_return([whitelisted_ip, whitelisted_ip_range]) - allow_any_instance_of(MetricsService).to receive(:metrics_text).and_return("prometheus_label 1") + allow_any_instance_of(MetricsService).to receive(:metrics_text).and_return("prometheus_counter 1") end describe '#index' do @@ -24,7 +24,7 @@ describe MetricsController do get :index expect(response.status).to eq(200) - expect(response.body).to match(/^prometheus_label 1$/) + expect(response.body).to match(/^prometheus_counter 1$/) end context 'prometheus metrics are disabled' do |