AO3-6634 Add board_assistants_team admin role (#4749)

* AO3-6634 Add board_assistants_team role * AO3-6634 Rename SPAM_COMMENT_ROLES to SPAM_WORK_COMMENT_ROLES for clarity * AO3-6634 Actually no I don't like that, put it back * AO3-6634 Prefer .nil? to == nil and put in a context block I missed * AO3-6634 Prefer update! for roles * AO3-6634 More shared examples * AO3-6634 Prefer update! for roles
otwcode · Apr 4, 2024 · dbcbef8 · dbcbef8
1 parent 321fee4
commit dbcbef8
Show file tree

Hide file tree

Showing 8 changed files with 401 additions and 203 deletions.
diff --git a/app/models/admin.rb b/app/models/admin.rb
@@ -1,5 +1,5 @@
 class Admin < ApplicationRecord
-  VALID_ROLES = %w[superadmin board communications development_and_membership elections translation tag_wrangling docs support policy_and_abuse open_doors].freeze
+  VALID_ROLES = %w[superadmin board board_assistants_team communications development_and_membership docs elections translation tag_wrangling support policy_and_abuse open_doors].freeze
 
   serialize :roles, Array
 

diff --git a/app/policies/admin_banner_policy.rb b/app/policies/admin_banner_policy.rb
@@ -1,6 +1,6 @@
 class AdminBannerPolicy < ApplicationPolicy
-  ACCESS_AND_EDIT_ROLES = %w[superadmin board communications development_and_membership support].freeze
-  CREATE_AND_DESTROY_ROLES = %w[superadmin board communications support].freeze
+  ACCESS_AND_EDIT_ROLES = %w[superadmin board board_assistants_team communications development_and_membership support].freeze
+  CREATE_AND_DESTROY_ROLES = %w[superadmin board board_assistants_team communications support].freeze
 
   def index?
     user_has_roles?(ACCESS_AND_EDIT_ROLES)

diff --git a/app/policies/admin_post_policy.rb b/app/policies/admin_post_policy.rb
@@ -1,5 +1,5 @@
 class AdminPostPolicy < ApplicationPolicy
-  POSTING_ROLES = %w[superadmin board communications support translation].freeze
+  POSTING_ROLES = %w[superadmin board board_assistants_team communications support translation].freeze
 
   def can_post?
     user_has_roles?(POSTING_ROLES)

diff --git a/app/policies/comment_policy.rb b/app/policies/comment_policy.rb
@@ -1,11 +1,12 @@
 class CommentPolicy < ApplicationPolicy
   DESTROY_COMMENT_ROLES = %w[superadmin board policy_and_abuse support].freeze
-  DESTROY_ADMIN_POST_COMMENT_ROLES = %w[superadmin board communications elections policy_and_abuse support].freeze
+  DESTROY_ADMIN_POST_COMMENT_ROLES = %w[superadmin board board_assistants_team communications elections policy_and_abuse support].freeze
   FREEZE_TAG_COMMENT_ROLES = %w[superadmin tag_wrangling].freeze
   FREEZE_WORK_COMMENT_ROLES = %w[superadmin policy_and_abuse].freeze
   HIDE_TAG_COMMENT_ROLES = %w[superadmin tag_wrangling].freeze
   HIDE_WORK_COMMENT_ROLES = %w[superadmin policy_and_abuse].freeze
-  SPAM_ROLES = %w[superadmin board communications elections policy_and_abuse support].freeze
+  SPAM_ADMIN_POST_COMMENT_ROLES = %w[superadmin board board_assistants_team communications elections policy_and_abuse support].freeze
+  SPAM_COMMENT_ROLES = %w[superadmin board policy_and_abuse support].freeze
 
   def can_destroy_comment?
     case record.ultimate_parent
@@ -39,7 +40,12 @@ def can_hide_comment?
   end
 
   def can_mark_comment_spam?
-    user_has_roles?(SPAM_ROLES)
+    case record.ultimate_parent
+    when AdminPost
+      user_has_roles?(SPAM_ADMIN_POST_COMMENT_ROLES)
+    else
+      user_has_roles?(SPAM_COMMENT_ROLES)
+    end
   end
 
   alias destroy? can_destroy_comment?

diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml
@@ -4,6 +4,7 @@ en:
     attributes:
       admin/role:
         board: Board
+        board_assistants_team: Board Assistants Team
         communications: Communications
         development_and_membership: Development & Membership
         docs: AO3 Docs

diff --git a/spec/controllers/admin/banners_controller_spec.rb b/spec/controllers/admin/banners_controller_spec.rb
@@ -50,7 +50,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications development_and_membership support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications development_and_membership support]
   end
 
   describe "GET #show" do
@@ -61,7 +61,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications development_and_membership support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications development_and_membership support]
   end
 
   describe "GET #new" do
@@ -72,7 +72,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications support]
   end
 
   describe "POST #create" do
@@ -83,7 +83,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications support]
   end
 
   describe "GET #edit" do
@@ -94,7 +94,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications development_and_membership support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications development_and_membership support]
   end
 
   describe "PUT #update" do
@@ -106,7 +106,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications development_and_membership support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications development_and_membership support]
   end
 
   describe "GET #confirm_delete" do
@@ -117,7 +117,7 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications support]
   end
 
   describe "DELETE #destroy" do
@@ -129,6 +129,6 @@
     end
 
     it_behaves_like "only authorized admins are allowed",
-                    authorized_roles: %w[superadmin board communications support]
+                    authorized_roles: %w[superadmin board board_assistants_team communications support]
   end
 end