diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-01 20:28:10 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-01 20:28:25 +0200 |
commit | b243c3ea783df5070f889abbefc918f6599a916e (patch) | |
tree | f9cdcc4ffc9b50089c7d3f84dc0c1dd1c5711f9a | |
parent | 6232543db3a784744e1cb03bb6a1a1648bb84b15 (diff) | |
download | gitlab-ce-b243c3ea783df5070f889abbefc918f6599a916e.tar.gz |
Give metric query context rspec examples correctly sounding names. + missing whitespace
-rw-r--r-- | lib/gitlab/prometheus/queries/query_additional_metrics.rb | 1 | ||||
-rw-r--r-- | spec/support/prometheus/additional_metrics_shared_examples.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb index 5827c117556..d96921a9ee7 100644 --- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb +++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb @@ -51,6 +51,7 @@ module Gitlab query[:query] %= context client_query(query[:query], time: context[:timeframe_end]) end + query[:result] = result&.map(&:deep_symbolize_keys) query end diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb index 18b02920104..620fa37d455 100644 --- a/spec/support/prometheus/additional_metrics_shared_examples.rb +++ b/spec/support/prometheus/additional_metrics_shared_examples.rb @@ -23,13 +23,13 @@ RSpec.shared_examples 'additional metrics query' do subject! { described_class.new(client) } shared_examples 'query context containing environment slug and filter' do - it 'query context contains ci_environment_slug' do + it 'contains ci_environment_slug' do expect(subject).to receive(:query_metrics).with(hash_including(ci_environment_slug: environment.slug)) subject.query(*query_params) end - it 'query context contains environment filter' do + it 'contains environment filter' do expect(subject).to receive(:query_metrics).with( hash_including( environment_filter: "container_name!=\"POD\",environment=\"#{environment.slug}\"" |