summaryrefslogtreecommitdiff
path: root/spec/models/ability_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-18 13:16:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-18 13:16:36 +0000
commit311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch)
tree07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/models/ability_spec.rb
parent27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff)
downloadgitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/models/ability_spec.rb')
-rw-r--r--spec/models/ability_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index e131661602e..bb8d476f257 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -425,9 +425,9 @@ RSpec.describe Ability do
expect(keys).to include(
:administrator,
'admin',
- "/dp/condition/BasePolicy/admin/#{user_b.id}"
+ "/dp/condition/BasePolicy/admin/User:#{user_b.id}"
)
- expect(keys).not_to include("/dp/condition/BasePolicy/admin/#{user_a.id}")
+ expect(keys).not_to include("/dp/condition/BasePolicy/admin/User:#{user_a.id}")
end
# regression spec for re-entrant admin condition checks