Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 17 deletions

diff --git a/spec/models/issue/metrics_spec.rb b/spec/models/issue/metrics_spec.rb
index 6e3ef69017b..2fdf1f09f80 100644
--- a/spec/models/issue/metrics_spec.rb
+++ b/spec/models/issue/metrics_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Issue::Metrics do
     end
   end
 
-  shared_examples "when recording the default set of issue metrics on issue save" do
+  context "when recording the default set of issue metrics on issue save" do
     context "milestones" do
       it "records the first time an issue is associated with a milestone" do
         time = Time.current
@@ -81,20 +81,4 @@ RSpec.describe Issue::Metrics do
       end
     end
   end
-
-  context 'when upsert_issue_metrics is enabled' do
-    before do
-      stub_feature_flags(upsert_issue_metrics: true)
-    end
-
-    it_behaves_like 'when recording the default set of issue metrics on issue save'
-  end
-
-  context 'when upsert_issue_metrics is disabled' do
-    before do
-      stub_feature_flags(upsert_issue_metrics: false)
-    end
-
-    it_behaves_like 'when recording the default set of issue metrics on issue save'
-  end
 end