summaryrefslogtreecommitdiff
path: root/spec/policies
diff options
context:
space:
mode:
authorFabio Papa <fabtheman@gmail.com>2019-06-25 21:59:10 -0700
committerFabio Papa <fabtheman@gmail.com>2019-07-19 12:06:56 -0700
commit396926bbe4182d415e8aa129f45bc1c8ba9e4694 (patch)
tree06675feeca51b8a666a2060e0edf202b648c3fe3 /spec/policies
parentdc65d4f36cb5d0ae1ce0f1c6c1a1a646f1e0cb99 (diff)
downloadgitlab-ce-396926bbe4182d415e8aa129f45bc1c8ba9e4694.tar.gz
Add examples specing the setting to choose who can create subgroups
This setting is at the group level only. The default is specified to be maintainers and owners. **Specs only**, all failing.
Diffstat (limited to 'spec/policies')
-rw-r--r--spec/policies/group_policy_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index dc3675a7b9e..893b686da43 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -506,11 +506,15 @@ describe GroupPolicy do
context "create_subgroup" do
context 'when group has subgroup creation level set to owner' do
+<<<<<<< HEAD
let(:group) do
create(
:group,
subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
end
+=======
+ let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
+>>>>>>> Add examples specing the setting to choose who can create subgroups
context 'reporter' do
let(:current_user) { reporter }
@@ -538,11 +542,15 @@ describe GroupPolicy do
end
context 'when group has subgroup creation level set to maintainer' do
+<<<<<<< HEAD
let(:group) do
create(
:group,
subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
end
+=======
+ let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
+>>>>>>> Add examples specing the setting to choose who can create subgroups
context 'reporter' do
let(:current_user) { reporter }