diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:10:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:10:35 +0300 |
commit | 3597fb6d337baab5847863feedc98b433fb4000c (patch) | |
tree | 7c2cf77f03fc2dc43af4198bdddc75221edacaac /spec/controllers/projects | |
parent | ec4abad65d774cfc94110577589d44de5da825de (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/protected_branches_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/protected_branches_controller_spec.rb b/spec/controllers/projects/protected_branches_controller_spec.rb index a0cb5c1473a..dcfccc00347 100644 --- a/spec/controllers/projects/protected_branches_controller_spec.rb +++ b/spec/controllers/projects/protected_branches_controller_spec.rb @@ -42,7 +42,7 @@ RSpec.describe Projects::ProtectedBranchesController do context 'when a policy restricts rule deletion' do before do - policy = instance_double(ProtectedBranchPolicy, can?: false) + policy = instance_double(ProtectedBranchPolicy, allowed?: false) allow(ProtectedBranchPolicy).to receive(:new).and_return(policy) end @@ -70,7 +70,7 @@ RSpec.describe Projects::ProtectedBranchesController do context 'when a policy restricts rule deletion' do before do - policy = instance_double(ProtectedBranchPolicy, can?: false) + policy = instance_double(ProtectedBranchPolicy, allowed?: false) allow(ProtectedBranchPolicy).to receive(:new).and_return(policy) end @@ -97,7 +97,7 @@ RSpec.describe Projects::ProtectedBranchesController do context 'when a policy restricts rule deletion' do before do - policy = instance_double(ProtectedBranchPolicy, can?: false) + policy = instance_double(ProtectedBranchPolicy, allowed?: false) allow(ProtectedBranchPolicy).to receive(:new).and_return(policy) end |