1 files changed, 19 insertions, 10 deletions
diff --git a/spec/lib/gitlab/usage/metric_definition_spec.rb b/spec/lib/gitlab/usage/metric_definition_spec.rb
index e101f837324..8b592838f5d 100644
--- a/spec/lib/gitlab/usage/metric_definition_spec.rb
+++ b/spec/lib/gitlab/usage/metric_definition_spec.rb
@@ -5,18 +5,14 @@ require 'spec_helper'
 RSpec.describe Gitlab::Usage::MetricDefinition do
   let(:attributes) do
     {
-      name: 'uuid',
       description: 'GitLab instance unique identifier',
       value_type: 'string',
       product_category: 'collection',
-      stage: 'growth',
+      product_stage: 'growth',
       status: 'data_available',
       default_generation: 'generation_1',
-      full_path: {
-        generation_1: 'uuid',
-        generation_2: 'license.uuid'
-      },
-      group: 'group::product analytics',
+      key_path: 'uuid',
+      product_group: 'group::product analytics',
       time_frame: 'none',
       data_source: 'database',
       distribution: %w(ee ce),
@@ -44,13 +40,12 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
     using RSpec::Parameterized::TableSyntax
 
     where(:attribute, :value) do
-      :name               | nil
       :description        | nil
       :value_type         | nil
       :value_type         | 'test'
       :status             | nil
-      :default_generation | nil
-      :group              | nil
+      :key_path           | nil
+      :product_group      | nil
       :time_frame         | nil
       :time_frame         | '29d'
       :data_source        | 'other'
@@ -70,6 +65,20 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
 
         described_class.new(path, attributes).validate!
       end
+
+      context 'with skip_validation' do
+        it 'raise exception if skip_validation: false' do
+          expect(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception).at_least(:once).with(instance_of(Gitlab::Usage::Metric::InvalidMetricError))
+
+          described_class.new(path, attributes.merge( { skip_validation: false } )).validate!
+        end
+
+        it 'does not raise exception if has skip_validation: true' do
+          expect(Gitlab::ErrorTracking).not_to receive(:track_and_raise_for_dev_exception)
+
+          described_class.new(path, attributes.merge( { skip_validation: true } )).validate!
+        end
+      end
     end
   end