Remove CommonMetricsImporter patch

Remove CommonMetricsImporter patch and change all references to
CommonMetrics::Importer. Move specs into their appropriate folders. Also
cleans up some common_metric importer namespacing.

2 files changed, 20 insertions, 18 deletions

diff --git a/spec/db/importers/common_metrics_importer_spec.rb b/spec/lib/gitlab/importers/common_metrics/importer_spec.rb
index 02e7d51c268..31745186a8d 100644
--- a/spec/db/importers/common_metrics_importer_spec.rb
+++ b/spec/lib/gitlab/importers/common_metrics/importer_spec.rb
@@ -1,25 +1,8 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require Rails.root.join("db", "importers", "common_metrics_importer.rb")
 
-describe Gitlab::Importers::CommonMetrics::PrometheusMetric do
-  let(:existing_group_titles) do
-    ::PrometheusMetricEnums.group_details.each_with_object({}) do |(key, value), memo|
-      memo[key] = value[:group_title]
-    end
-  end
-
-  it 'group enum equals ::PrometheusMetric' do
-    expect(described_class.groups).to eq(::PrometheusMetric.groups)
-  end
-
-  it 'GROUP_TITLES equals ::PrometheusMetric' do
-    expect(Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.group_titles).to eq(existing_group_titles)
-  end
-end
-
-describe Importers::CommonMetricsImporter do
+describe Gitlab::Importers::CommonMetrics::Importer do
   subject { described_class.new }
 
   context "does import common_metrics.yml" do
diff --git a/spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb b/spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb
new file mode 100644
index 00000000000..5ce0b0aff64
--- /dev/null
+++ b/spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Gitlab::Importers::CommonMetrics::PrometheusMetric do
+  let(:existing_group_titles) do
+    ::PrometheusMetricEnums.group_details.each_with_object({}) do |(key, value), memo|
+      memo[key] = value[:group_title]
+    end
+  end
+
+  it 'group enum equals ::PrometheusMetric' do
+    expect(described_class.groups).to eq(::PrometheusMetric.groups)
+  end
+
+  it '.group_titles equals ::PrometheusMetric' do
+    expect(Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.group_titles).to eq(existing_group_titles)
+  end
+end