diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-07 02:36:59 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-07 02:38:52 +0200 |
commit | a7e1205219387a6d24c8579994f73a33b3028010 (patch) | |
tree | 6b0c2398d0f13d8b156eb8f74f8e4f76a9ad4dd9 /spec/controllers/projects/prometheus_controller_spec.rb | |
parent | 969b812433b6030b15b591ec5862daae1b707025 (diff) | |
download | gitlab-ce-a7e1205219387a6d24c8579994f73a33b3028010.tar.gz |
Use explicit instance of prometheus service and add access methods to it
Diffstat (limited to 'spec/controllers/projects/prometheus_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/prometheus_controller_spec.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb index 7c976cfad83..a994ac6409f 100644 --- a/spec/controllers/projects/prometheus_controller_spec.rb +++ b/spec/controllers/projects/prometheus_controller_spec.rb @@ -8,7 +8,7 @@ describe Projects::PrometheusController do before do allow(controller).to receive(:project).and_return(project) - allow(project).to receive(:monitoring_service).and_return(prometheus_service) + allow(controller).to receive(:prometheus_service).and_return(prometheus_service) project.add_master(user) sign_in(user) @@ -16,11 +16,11 @@ describe Projects::PrometheusController do describe 'GET #active_metrics' do context 'when prometheus metrics are enabled' do - before do - allow(prometheus_service).to receive(:reactive_query) - end - context 'when data is not present' do + before do + allow(prometheus_service).to receive(:matched_metrics).and_return({}) + end + it 'returns no content response' do get :active_metrics, project_params(format: :json) @@ -32,8 +32,7 @@ describe Projects::PrometheusController do let(:sample_response) { { some_data: 1 } } before do - allow(prometheus_service).to receive(:reactive_query).with(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name) - .and_return(sample_response) + allow(prometheus_service).to receive(:matched_metrics).and_return(sample_response) end it 'returns no content response' do |