summaryrefslogtreecommitdiff
path: root/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-17 15:09:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-17 15:09:22 +0000
commit99f4b14cb0546a905d8f14f938d679d17e569005 (patch)
treed0520a58f46c8b5ceb018ca4d404e9a682f4af3c /spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
parent4f8983ade80c0d71d4c8e6cc0d686c9cecf5e7d4 (diff)
downloadgitlab-ce-99f4b14cb0546a905d8f14f938d679d17e569005.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb')
-rw-r--r--spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
index a58b83dc42c..fc8b1efd226 100644
--- a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
+++ b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
@@ -25,9 +25,7 @@ RSpec.describe ControllerWithCrossProjectAccessCheck do
# `described_class` is not available in this context
include ControllerWithCrossProjectAccessCheck
- requires_cross_project_access :index, show: false,
- unless: -> { unless_condition },
- if: -> { if_condition }
+ requires_cross_project_access :index, show: false, unless: -> { unless_condition }, if: -> { if_condition }
def index
head :ok
@@ -86,9 +84,10 @@ RSpec.describe ControllerWithCrossProjectAccessCheck do
requires_cross_project_access
- skip_cross_project_access_check index: true, show: false,
- unless: -> { unless_condition },
- if: -> { if_condition }
+ skip_cross_project_access_check index: true,
+ show: false,
+ unless: -> { unless_condition },
+ if: -> { if_condition }
def index
head :ok