summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Papa <fabtheman@gmail.com>2019-07-01 16:27:49 -0700
committerFabio Papa <fabtheman@gmail.com>2019-07-01 16:27:49 -0700
commit0f659a0da634bf61378766d6ec247cc49595becf (patch)
tree75b520e8c89653cb6630ff82315deab944e16e69
parent650b88fc41d51f3d313e74bb94cbd211ca54003b (diff)
downloadgitlab-ce-0f659a0da634bf61378766d6ec247cc49595becf.tar.gz
Fix some code style issues
-rw-r--r--spec/features/groups/show_spec.rb12
-rw-r--r--spec/policies/group_policy_spec.rb13
2 files changed, 14 insertions, 11 deletions
diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index 5096abadb79..f1501181432 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -56,10 +56,14 @@ describe 'Group show page' do
end
context 'subgroup support' do
- let(:restricted_group) { create(:group,
- subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
- let(:relaxed_group) { create(:group,
- subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
+ let(:restricted_group) do
+ create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
+ end
+
+ let(:relaxed_group) do
+ create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+ end
+
let(:owner) { create(:user) }
let(:maintainer) { create(:user) }
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 020b51f776e..dc3675a7b9e 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -99,9 +99,9 @@ describe GroupPolicy do
let(:current_user) { maintainer }
context 'with subgroup_creation level set to maintainer' do
- let(:group) { create(:group,
- :private,
- subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
+ let(:group) do
+ create(:group, :private, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+ end
it 'allows every maintainer permission plus creating subgroups' do
allow(Group).to receive(:supports_nested_objects?).and_return(true)
@@ -207,10 +207,9 @@ describe GroupPolicy do
end
describe 'private nested group use the highest access level from the group and inherited permissions', :nested_groups do
- let(:nested_group) { create(:group,
- :private,
- :owner_subgroup_creation_only,
- parent: group) }
+ let(:nested_group) do
+ create(:group, :private, :owner_subgroup_creation_only, parent: group)
+ end
before do
nested_group.add_guest(guest)