Add latest changes from gitlab-org/gitlab@master

3 files changed, 58 insertions, 2 deletions

diff --git a/spec/policies/project_group_link_policy_spec.rb b/spec/policies/project_group_link_policy_spec.rb
new file mode 100644
index 00000000000..7c8a4619e47
--- /dev/null
+++ b/spec/policies/project_group_link_policy_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ProjectGroupLinkPolicy, feature_category: :authentication_and_authorization do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group, :private) }
+  let_it_be(:group2) { create(:group, :private) }
+  let_it_be(:project) { create(:project, :private, group: group) }
+
+  let(:project_group_link) do
+    create(:project_group_link, project: project, group: group2, group_access: Gitlab::Access::DEVELOPER)
+  end
+
+  subject(:policy) { described_class.new(user, project_group_link) }
+
+  context 'when the user is a group owner' do
+    before do
+      project_group_link.group.add_owner(user)
+    end
+
+    context 'when user is not project maintainer' do
+      it 'can admin group_project_link' do
+        expect(policy).to be_allowed(:admin_project_group_link)
+      end
+    end
+
+    context 'when user is a project maintainer' do
+      before do
+        project_group_link.project.add_maintainer(user)
+      end
+
+      it 'can admin group_project_link' do
+        expect(policy).to be_allowed(:admin_project_group_link)
+      end
+    end
+  end
+
+  context 'when user is not a group owner' do
+    context 'when user is a project maintainer' do
+      it 'can admin group_project_link' do
+        project_group_link.project.add_maintainer(user)
+
+        expect(policy).to be_allowed(:admin_project_group_link)
+      end
+    end
+
+    context 'when user is not a project maintainer' do
+      it 'cannot admin group_project_link' do
+        project_group_link.project.add_developer(user)
+
+        expect(policy).to be_disallowed(:admin_project_group_link)
+      end
+    end
+  end
+end
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index e370f536519..a98f091b9fc 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ProjectPolicy do
+RSpec.describe ProjectPolicy, feature_category: :authentication_and_authorization do
   include ExternalAuthorizationServiceHelpers
   include AdminModeHelper
   include_context 'ProjectPolicy context'
diff --git a/spec/policies/work_item_policy_spec.rb b/spec/policies/work_item_policy_spec.rb
index ed76ec1eccf..3d282271d60 100644
--- a/spec/policies/work_item_policy_spec.rb
+++ b/spec/policies/work_item_policy_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe WorkItemPolicy do
   let_it_be(:reporter) { create(:user).tap { |user| project.add_reporter(user) } }
   let_it_be(:group_reporter) { create(:user).tap { |user| group.add_reporter(user) } }
   let_it_be(:non_member_user) { create(:user) }
-  let_it_be(:work_item) { create(:work_item, project: project) }
+  let_it_be_with_reload(:work_item) { create(:work_item, project: project) }
   let_it_be(:authored_work_item) { create(:work_item, project: project, author: guest_author) }
   let_it_be(:public_work_item) { create(:work_item, project: public_project) }