Merge branch 'fj-26380-admin-manages-personal-snippets' into 'master'

Allow admins to administer personal snippets

See merge request gitlab-org/gitlab!19693

app/policies/personal_snippet_policy.rb

@@ -10,7 +10,7 @@ class PersonalSnippetPolicy < BasePolicy
     enable :create_note
   end
 
-  rule { is_author }.policy do
+  rule { is_author | admin }.policy do
     enable :read_personal_snippet
     enable :update_personal_snippet
     enable :destroy_personal_snippet

changelogs/unreleased/26380-personal-snippets.yml

+---
+title: Allow admins to administer personal snippets
+merge_request: 19693
+author: Oren Kanner
+type: fixed

spec/policies/personal_snippet_policy_spec.rb

@@ -20,6 +20,19 @@ describe PersonalSnippetPolicy do
     described_class.new(user, snippet)
   end
 
+  shared_examples 'admin access' do
+    context 'admin user' do
+      subject { permissions(admin_user) }
+
+      it do
+        is_expected.to be_allowed(:read_personal_snippet)
+        is_expected.to be_allowed(:create_note)
+        is_expected.to be_allowed(:award_emoji)
+        is_expected.to be_allowed(*author_permissions)
+      end
+    end
+  end
+
   context 'public snippet' do
     let(:snippet) { create(:personal_snippet, :public) }
 
@@ -55,6 +68,8 @@ describe PersonalSnippetPolicy do
         is_expected.to be_allowed(*author_permissions)
       end
     end
+
+    it_behaves_like 'admin access'
   end
 
   context 'internal snippet' do
@@ -103,6 +118,8 @@ describe PersonalSnippetPolicy do
         is_expected.to be_allowed(*author_permissions)
       end
     end
+
+    it_behaves_like 'admin access'
   end
 
   context 'private snippet' do
@@ -130,17 +147,6 @@ describe PersonalSnippetPolicy do
       end
     end
 
-    context 'admin user' do
-      subject { permissions(admin_user) }
-
-      it do
-        is_expected.to be_allowed(:read_personal_snippet)
-        is_expected.to be_disallowed(:create_note)
-        is_expected.to be_disallowed(:award_emoji)
-        is_expected.to be_disallowed(*author_permissions)
-      end
-    end
-
     context 'external user' do
       subject { permissions(external_user) }
 
@@ -162,5 +168,7 @@ describe PersonalSnippetPolicy do
         is_expected.to be_allowed(*author_permissions)
       end
     end
+
+    it_behaves_like 'admin access'
   end
 end