From 1b6ab2dffce29df53f57cd857720b9f77ab4a7ca Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 5 Jun 2017 21:00:57 +0200 Subject: Remove orig file + rubocop cleanup --- .../queries/additional_metrics_deployment_query.rb | 2 -- .../prometheus/queries/additional_metrics_query.rb | 5 ++--- lib/gitlab/prometheus_client.rb | 2 +- spec/db/production/settings.rb.orig | 16 ---------------- .../prometheus/queries/matched_metrics_query_spec.rb | 9 +++++++-- .../prometheus/additional_metrics_shared_examples.rb | 5 +++-- 6 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 spec/db/production/settings.rb.orig diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb index 382052c298f..7693772bf81 100644 --- a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb +++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb @@ -1,6 +1,5 @@ module Gitlab::Prometheus::Queries class AdditionalMetricsDeploymentQuery < AdditionalMetricsQuery - def query(deployment_id) deployment = Deployment.find_by(id: deployment_id) query_context = { @@ -14,4 +13,3 @@ module Gitlab::Prometheus::Queries end end end - diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb index d21a3978e25..7ef4ee3a91a 100644 --- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb +++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb @@ -40,11 +40,11 @@ module Gitlab::Prometheus::Queries private def metric_with_any_queries(metric) - metric[:queries]&.count > 0 + metric[:queries]&.count&.> 0 end def group_with_any_metrics(group) - group[:metrics]&.count > 0 + group[:metrics]&.count&.> 0 end def query_with_result(query) @@ -64,7 +64,6 @@ module Gitlab::Prometheus::Queries query_with_result end - def available_metrics @available_metrics ||= client_label_values || [] end diff --git a/lib/gitlab/prometheus_client.rb b/lib/gitlab/prometheus_client.rb index f4ef4ff8ba4..aa94614bf18 100644 --- a/lib/gitlab/prometheus_client.rb +++ b/lib/gitlab/prometheus_client.rb @@ -29,7 +29,7 @@ module Gitlab end end - def label_values(name='__name__') + def label_values(name = '__name__') json_api_get("label/#{name}/values") end diff --git a/spec/db/production/settings.rb.orig b/spec/db/production/settings.rb.orig deleted file mode 100644 index 3cbb173c4cc..00000000000 --- a/spec/db/production/settings.rb.orig +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe 'seed production settings', lib: true do - include StubENV - - context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do - before do - stub_env('GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN', '013456789') - end - - it 'writes the token to the database' do - load(File.join(__dir__, '../../../db/fixtures/production/010_settings.rb')) - expect(ApplicationSetting.current.runners_registration_token).to eq('013456789') - end - end -end diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb index 2395675a247..d2796ab72da 100644 --- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb +++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb @@ -9,6 +9,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do def series_info_with_environment(*more_metrics) %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } } end + let(:metric_names) { %w{metric_a metric_b} } let(:series_info_without_environment) do [{ '__name__' => 'metric_a' }, @@ -110,7 +111,9 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do it 'responds with one metrics as active and no missing requiremens' do expect(subject.query).to eq([ { group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 }, - { group: 'nameb', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 }]) + { group: 'nameb', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 } + ] + ) end end @@ -122,7 +125,9 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do it 'responds with one metrics as active and no missing requiremens' do expect(subject.query).to eq([ { group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 }, - { group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }]) + { group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 } + ] + ) end end end diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb index 449a53664c1..0581eab95a0 100644 --- a/spec/support/prometheus/additional_metrics_shared_examples.rb +++ b/spec/support/prometheus/additional_metrics_shared_examples.rb @@ -81,7 +81,8 @@ RSpec.shared_examples 'additional metrics query' do result: [ { metric: {}, - values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] } + values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] + } ] } ] @@ -146,4 +147,4 @@ RSpec.shared_examples 'additional metrics query' do end end end -end \ No newline at end of file +end -- cgit v1.2.1