diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /spec/finders/concerns/finder_with_cross_project_access_spec.rb | |
parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'spec/finders/concerns/finder_with_cross_project_access_spec.rb')
-rw-r--r-- | spec/finders/concerns/finder_with_cross_project_access_spec.rb | 6 |
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) |