Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 18 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index d697840601f..02bcc716bee 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GroupPolicy do
   include_context 'GroupPolicy context'
 
-  context 'with no user' do
+  context 'public group with no user' do
     let(:group) { create(:group, :public) }
     let(:current_user) { nil }
 
@@ -33,7 +33,6 @@ describe GroupPolicy do
 
   context 'with foreign user and public project' do
     let(:project) { create(:project, :public) }
-    let(:user) { create(:user) }
     let(:current_user) { create(:user) }
 
     before do
@@ -105,8 +104,8 @@ describe GroupPolicy do
     let(:current_user) { maintainer }
 
     context 'with subgroup_creation level set to maintainer' do
-      let(:group) do
-        create(:group, :private, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+      before_all do
+        group.update(subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
       end
 
       it 'allows every maintainer permission plus creating subgroups' do
@@ -164,11 +163,11 @@ describe GroupPolicy do
   end
 
   describe 'private nested group use the highest access level from the group and inherited permissions' do
-    let(:nested_group) do
+    let_it_be(:nested_group) do
       create(:group, :private, :owner_subgroup_creation_only, parent: group)
     end
 
-    before do
+    before_all do
       nested_group.add_guest(guest)
       nested_group.add_guest(reporter)
       nested_group.add_guest(developer)
@@ -268,6 +267,10 @@ describe GroupPolicy do
       context 'when the group share_with_group_lock is enabled' do
         let(:group) { create(:group, share_with_group_lock: true, parent: parent) }
 
+        before do
+          group.add_owner(owner)
+        end
+
         context 'when the parent group share_with_group_lock is enabled' do
           context 'when the group has a grandparent' do
             let(:parent) { create(:group, share_with_group_lock: true, parent: grandparent) }
@@ -353,7 +356,9 @@ describe GroupPolicy do
 
   context "create_projects" do
     context 'when group has no project creation level set' do
-      let(:group) { create(:group, project_creation_level: nil) }
+      before_all do
+        group.update(project_creation_level: nil)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -381,7 +386,9 @@ describe GroupPolicy do
     end
 
     context 'when group has project creation level set to no one' do
-      let(:group) { create(:group, project_creation_level: ::Gitlab::Access::NO_ONE_PROJECT_ACCESS) }
+      before_all do
+        group.update(project_creation_level: ::Gitlab::Access::NO_ONE_PROJECT_ACCESS)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -409,7 +416,9 @@ describe GroupPolicy do
     end
 
     context 'when group has project creation level set to maintainer only' do
-      let(:group) { create(:group, project_creation_level: ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS) }
+      before_all do
+        group.update(project_creation_level: ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -437,7 +446,9 @@ describe GroupPolicy do
     end
 
     context 'when group has project creation level set to developers + maintainer' do
-      let(:group) { create(:group, project_creation_level: ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS) }
+      before_all do
+        group.update(project_creation_level: ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS)
+      end
 
       context 'reporter' do
         let(:current_user) { reporter }
@@ -467,10 +478,8 @@ describe GroupPolicy do
 
   context "create_subgroup" do
     context 'when group has subgroup creation level set to owner' do
-      let(:group) do
-        create(
-          :group,
-          subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
+      before_all do
+        group.update(subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
       end
 
       context 'reporter' do
@@ -499,10 +508,8 @@ describe GroupPolicy do
     end
 
     context 'when group has subgroup creation level set to maintainer' do
-      let(:group) do
-        create(
-          :group,
-          subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
+      before_all do
+        group.update(subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
       end
 
       context 'reporter' do