Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 5 insertions, 1 deletions

diff --git a/spec/finders/concerns/finder_with_cross_project_access_spec.rb b/spec/finders/concerns/finder_with_cross_project_access_spec.rb
index 0798528c200..a4b483a8e5e 100644
--- a/spec/finders/concerns/finder_with_cross_project_access_spec.rb
+++ b/spec/finders/concerns/finder_with_cross_project_access_spec.rb
@@ -97,7 +97,11 @@ RSpec.describe FinderWithCrossProjectAccess do
       end
 
       it 're-enables the check after the find failed' do
-        finder.find(non_existing_record_id) rescue ActiveRecord::RecordNotFound
+        begin
+          finder.find(non_existing_record_id)
+        rescue ActiveRecord::RecordNotFound
+          nil
+        end
 
         expect(finder.instance_variable_get(:@should_skip_cross_project_check))
           .to eq(false)