1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/internal_events/event_definitions_spec.rb b/spec/lib/gitlab/internal_events/event_definitions_spec.rb
index 924845504ca..a00d1ab5ecb 100644
--- a/spec/lib/gitlab/internal_events/event_definitions_spec.rb
+++ b/spec/lib/gitlab/internal_events/event_definitions_spec.rb
@@ -3,7 +3,9 @@
 require "spec_helper"
 
 RSpec.describe Gitlab::InternalEvents::EventDefinitions, feature_category: :product_analytics_data_management do
-  after(:all) do
+  around do |example|
+    described_class.instance_variable_set(:@events, nil)
+    example.run
     described_class.instance_variable_set(:@events, nil)
   end
 
@@ -20,7 +22,6 @@ RSpec.describe Gitlab::InternalEvents::EventDefinitions, feature_category: :prod
     let(:events2) { { 'event2' => nil } }
 
     before do
-      allow(Gitlab::Usage::MetricDefinition).to receive(:metric_definitions_changed?).and_return(true)
       allow(Gitlab::Usage::MetricDefinition).to receive(:all).and_return([definition1, definition2])
       allow(definition1).to receive(:available?).and_return(true)
       allow(definition2).to receive(:available?).and_return(true)
@@ -58,9 +59,8 @@ RSpec.describe Gitlab::InternalEvents::EventDefinitions, feature_category: :prod
       end
 
       context 'when event does not have unique property' do
-        it 'unique fails' do
-          expect { described_class.unique_property('event1') }
-            .to raise_error(described_class::InvalidMetricConfiguration, /Unique property not defined for/)
+        it 'returns nil' do
+          expect(described_class.unique_property('event1')).to be_nil
         end
       end
     end