3 files changed, 7 insertions, 9 deletions
diff --git a/spec/controllers/concerns/group_tree_spec.rb b/spec/controllers/concerns/group_tree_spec.rb
index e808f1caa6e..921706b2042 100644
--- a/spec/controllers/concerns/group_tree_spec.rb
+++ b/spec/controllers/concerns/group_tree_spec.rb
@@ -102,13 +102,5 @@ RSpec.describe GroupTree do
     end
 
     it_behaves_like 'returns filtered groups'
-
-    context 'when feature flag :linear_group_tree_ancestor_scopes is disabled' do
-      before do
-        stub_feature_flags(linear_group_tree_ancestor_scopes: false)
-      end
-
-      it_behaves_like 'returns filtered groups'
-    end
   end
 end
diff --git a/spec/controllers/concerns/import_url_params_spec.rb b/spec/controllers/concerns/import_url_params_spec.rb
index 72f13cdcc94..ddffb243f7a 100644
--- a/spec/controllers/concerns/import_url_params_spec.rb
+++ b/spec/controllers/concerns/import_url_params_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe ImportUrlParams do
   let(:import_url_params) do
-    controller = OpenStruct.new(params: params).extend(described_class)
+    controller = double('controller', params: params).extend(described_class)
     controller.import_url_params
   end
 
diff --git a/spec/controllers/concerns/renders_commits_spec.rb b/spec/controllers/concerns/renders_commits_spec.rb
index 5c918267f50..acdeb98bb16 100644
--- a/spec/controllers/concerns/renders_commits_spec.rb
+++ b/spec/controllers/concerns/renders_commits_spec.rb
@@ -64,6 +64,12 @@ RSpec.describe RendersCommits do
         subject.prepare_commits_for_rendering(merge_request.commits.take(1))
       end
 
+      # Populate Banzai::Filter::References::ReferenceCache
+      subject.prepare_commits_for_rendering(merge_request.commits)
+
+      # Reset lazy_latest_pipeline cache to simulate a new request
+      BatchLoader::Executor.clear_current
+
       expect do
         subject.prepare_commits_for_rendering(merge_request.commits)
         merge_request.commits.each(&:latest_pipeline)