diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
| commit | b6847c621ff246e6abceb90545d5a608318762d6 (patch) | |
| tree | 460da2a6c2be2e4f5164c2bba1851b66260f850d /spec/controllers/concerns | |
| parent | c08d9c22569d1c9e7c7737e183969593394133d9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns')
| -rw-r--r-- | spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb | 1 |
1 files changed, 1 insertions, 0 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 85989ea3e92..3f9d690837b 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 @@ -14,6 +14,7 @@ describe ControllerWithCrossProjectAccessCheck do context 'When reading cross project is not allowed' do before do allow(Ability).to receive(:allowed).and_call_original + expect(Ability).to receive(:allowed?).with(user, :log_in, :global).and_call_original allow(Ability).to receive(:allowed?) .with(user, :read_cross_project, :global) .and_return(false) |