summaryrefslogtreecommitdiff
path: root/spec/policies/group_policy_spec.rb
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-03-05 10:38:09 +0100
committerMałgorzata Ksionek <meksionek@gmail.com>2019-03-05 10:38:09 +0100
commita24eabb1782785ad0bcf2460c3fff67106598b83 (patch)
tree077b22e9726e7015bf5df98c68a007f3146a253c /spec/policies/group_policy_spec.rb
parentad2f711adfe151f15f19559884cd84a8dd26e93e (diff)
downloadgitlab-ce-a24eabb1782785ad0bcf2460c3fff67106598b83.tar.gz
Resolve conflicts in group policy
Diffstat (limited to 'spec/policies/group_policy_spec.rb')
-rw-r--r--spec/policies/group_policy_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 4c31ff30fc6..0ad50c6f91f 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -114,13 +114,13 @@ describe GroupPolicy do
project.add_developer(current_user)
end
- it { expect_allowed(:read_label) }
+ it { expect_allowed(:read_label, :read_list) }
context 'in subgroups', :nested_groups do
let(:subgroup) { create(:group, :private, parent: group) }
let(:project) { create(:project, namespace: subgroup) }
- it { expect_allowed(:read_label) }
+ it { expect_allowed(:read_label, :read_list) }
end
end