diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 16:36:42 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 16:36:42 +0000 |
commit | e21f171d9a8a9e10970dcb72df14a0b7c2fc62b8 (patch) | |
tree | 2be6eb84b08f56673ca07cd76b26f4b8b53ba372 | |
parent | e68ebdfb4e719a7711ff7e2650707a99e2352321 (diff) | |
parent | fe8b842a755375e4ab9e716c5ab8c34ea868e96a (diff) | |
download | gitlab-ce-e21f171d9a8a9e10970dcb72df14a0b7c2fc62b8.tar.gz |
Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master'
Use Rails.root for CommonMetricsImporter
Closes #51333
See merge request gitlab-org/gitlab-ce!21664
-rw-r--r-- | db/importers/common_metrics_importer.rb | 4 | ||||
-rw-r--r-- | spec/db/importers/common_metrics_importer_spec.rb | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/db/importers/common_metrics_importer.rb b/db/importers/common_metrics_importer.rb index 01fbbd6866b..6302394d7a6 100644 --- a/db/importers/common_metrics_importer.rb +++ b/db/importers/common_metrics_importer.rb @@ -35,8 +35,8 @@ module Importers attr_reader :content - def initialize(file = 'config/prometheus/common_metrics.yml') - @content = YAML.load_file(file) + def initialize(filename = 'common_metrics.yml') + @content = YAML.load_file(Rails.root.join('config', 'prometheus', filename)) end def execute diff --git a/spec/db/importers/common_metrics_importer_spec.rb b/spec/db/importers/common_metrics_importer_spec.rb index 16b59e1dfe8..68260820958 100644 --- a/spec/db/importers/common_metrics_importer_spec.rb +++ b/spec/db/importers/common_metrics_importer_spec.rb @@ -47,6 +47,16 @@ describe Importers::CommonMetricsImporter do end end + context "does import common_metrics.yml" do + it "when executed from outside of the Rails.root" do + Dir.chdir(Dir.tmpdir) do + expect { subject.execute }.not_to raise_error + end + + expect(PrometheusMetric.common).not_to be_empty + end + end + context 'does import properly all fields' do let(:query_identifier) { 'response-metric' } let(:group) do |