Automatic merge of gitlab-org/gitlab-ce master

spec/features/security/group/private_access_spec.rb

@@ -103,11 +103,7 @@ describe 'Private Group access' do
     let(:project) { create(:project, :public) }
 
     before do
-      Projects::GroupLinks::CreateService.new(
-        project,
-        create(:user),
-        link_group_access: ProjectGroupLink::DEVELOPER
-      ).execute(group)
+      create(:project_group_link, project: project, group: group)
     end
 
     subject { group_path(group) }

spec/policies/group_policy_spec.rb

@@ -77,15 +77,10 @@ describe GroupPolicy do
 
   context 'with no user and public project' do
     let(:project) { create(:project, :public) }
-    let(:user) { create(:user) }
     let(:current_user) { nil }
 
     before do
-      Projects::GroupLinks::CreateService.new(
-        project,
-        user,
-        link_group_access: ProjectGroupLink::DEVELOPER
-      ).execute(group)
+      create(:project_group_link, project: project, group: group)
     end
 
     it { expect_disallowed(:read_group) }
@@ -97,11 +92,7 @@ describe GroupPolicy do
     let(:current_user) { create(:user) }
 
     before do
-      Projects::GroupLinks::CreateService.new(
-        project,
-        user,
-        link_group_access: ProjectGroupLink::DEVELOPER
-      ).execute(group)
+      create(:project_group_link, project: project, group: group)
     end
 
     it { expect_disallowed(:read_group) }