Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AO3-6010 Add role for Legal #4889

Merged
merged 6 commits into from
Aug 14, 2024
Merged

AO3-6010 Add role for Legal #4889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
372692b
Add legal role
brianjaustin Aug 4, 2024
a132815
Users: grant access to search and admin view
brianjaustin Aug 4, 2024
96b1cad
Comments: deletion, hiding, IP visability
brianjaustin Aug 4, 2024
39ce607
Creations: hide/delete, view admin info
brianjaustin Aug 4, 2024
d79b760
Test fixes and remove spam access
brianjaustin Aug 9, 2024
46232e4
Increase test coverage of role access
brianjaustin Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/admin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class Admin < ApplicationRecord
VALID_ROLES = %w[superadmin board board_assistants_team communications development_and_membership docs elections translation tag_wrangling support policy_and_abuse open_doors].freeze
VALID_ROLES = %w[superadmin board board_assistants_team communications development_and_membership docs elections legal translation tag_wrangling support policy_and_abuse open_doors].freeze

serialize :roles, Array

Expand Down
10 changes: 5 additions & 5 deletions app/policies/comment_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class CommentPolicy < ApplicationPolicy
DESTROY_COMMENT_ROLES = %w[superadmin board policy_and_abuse support].freeze
DESTROY_ADMIN_POST_COMMENT_ROLES = %w[superadmin board board_assistants_team communications elections policy_and_abuse support].freeze
DESTROY_COMMENT_ROLES = %w[superadmin board legal policy_and_abuse support].freeze
DESTROY_ADMIN_POST_COMMENT_ROLES = %w[superadmin board board_assistants_team communications elections legal 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
HIDE_TAG_COMMENT_ROLES = %w[superadmin legal tag_wrangling].freeze
HIDE_WORK_COMMENT_ROLES = %w[superadmin legal policy_and_abuse].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

Expand Down Expand Up @@ -63,6 +63,6 @@ def can_review_all?
alias review_all? can_review_all?

def show_email?
user_has_roles?(%w[policy_and_abuse support superadmin])
user_has_roles?(%w[legal policy_and_abuse support superadmin])
end
end
10 changes: 6 additions & 4 deletions app/policies/user_creation_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
class UserCreationPolicy < ApplicationPolicy
FULL_ACCESS_ROLES = %w[superadmin legal policy_and_abuse].freeze

def show_admin_options?
destroy? || hide? || edit?
end

def destroy?
user_has_roles?(%w[superadmin policy_and_abuse])
user_has_roles?(FULL_ACCESS_ROLES)
end

def hide?
user_has_roles?(%w[superadmin policy_and_abuse])
user_has_roles?(FULL_ACCESS_ROLES)
end

def show_ip_address?
user_has_roles?(%w[superadmin policy_and_abuse])
user_has_roles?(FULL_ACCESS_ROLES)
end

def show_original_creators?
user_has_roles?(%w[superadmin policy_and_abuse])
user_has_roles?(FULL_ACCESS_ROLES)
end
end
2 changes: 1 addition & 1 deletion app/policies/user_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class UserPolicy < ApplicationPolicy
# - managing a user's invitations
# - updating a user's email and roles (e.g. wranglers, archivists, not admin roles)
# This is further restricted using ALLOWED_ATTRIBUTES_BY_ROLES.
MANAGE_ROLES = %w[superadmin policy_and_abuse open_doors support tag_wrangling].freeze
MANAGE_ROLES = %w[superadmin legal policy_and_abuse open_doors support tag_wrangling].freeze
brianjaustin marked this conversation as resolved.
Show resolved Hide resolved

# Roles that allow updating the Fannish Next Of Kin of a user.
MANAGE_NEXT_OF_KIN_ROLES = %w[superadmin policy_and_abuse support].freeze
Expand Down
1 change: 1 addition & 0 deletions config/locales/models/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ en:
development_and_membership: Development & Membership
docs: AO3 Docs
elections: Elections
legal: Legal
open_doors: Open Doors
policy_and_abuse: Policy & Abuse
superadmin: Super admin
Expand Down
167 changes: 141 additions & 26 deletions features/admins/admin_works.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I press "Troubleshoot"
Then I should see "Work sent to be reindexed."

Scenario: Can hide works
Scenario Outline: Can hide works
Given I am logged in as "regular_user"
And I post the work "ToS Violation"
When I am logged in as a "policy_and_abuse" admin
When I am logged in as a "<role>" admin
And all emails have been delivered
And I view the work "ToS Violation"
And I follow "Hide Work"
Expand All @@ -26,8 +26,14 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And "regular_user" should see their work "ToS Violation" is hidden
And 1 email should be delivered
And the email should contain "you will be required to take action to correct the violation"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |
brianjaustin marked this conversation as resolved.
Show resolved Hide resolved

Scenario: Can unhide works
Scenario Outline: Can unhide works
Given I am logged in as "regular_user"
And I post the work "ToS Violation"
When I am logged in as a "policy_and_abuse" admin
Expand All @@ -43,7 +49,13 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And logged in users should see the unhidden work "ToS Violation" by "regular_user"
And 0 emails should be delivered

Scenario: Can delete works
Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario: Deleting works as a Policy & Abuse admin
Given I am logged in as "regular_user"
And I post the work "ToS Violation"
When I am logged in as a "policy_and_abuse" admin
Expand All @@ -66,9 +78,28 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I am on regular_user's works page
Then I should not see "ToS Violation"

Scenario: Can hide bookmarks
Given basic tags
And I am logged in as "regular_user" with password "password1"
Scenario: Deleting works as a Legal admin
Given I am logged in as "regular_user"
And I post the work "ToS Violation"
When I am logged in as a "legal" admin
# Don't let the admin password email mess up the count.
And all emails have been delivered
And I view the work "ToS Violation"
And I follow "Delete Work"
And all indexing jobs have been run
Then I should see "Item was successfully deleted."
And 1 email should be delivered
And the email should contain "deleted from the Archive by a site admin"
And the email should not contain "translation missing"
When I log out
And I am on regular_user's works page
Then I should not see "ToS Violation"
When I am logged in
And I am on regular_user's works page
Then I should not see "ToS Violation"

Scenario Outline: Can hide bookmarks
Given I am logged in as "regular_user" with password "password1"
And I post the work "A Nice Work"
When I am logged in as "bad_user"
And I view the work "A Nice Work"
Expand All @@ -77,7 +108,7 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I press "Create"
And all indexing jobs have been run
Then I should see "Bookmark was successfully created"
When I am logged in as a "policy_and_abuse" admin
When I am logged in as a "<role>" admin
And I am on bad_user's bookmarks page
When I follow "Hide Bookmark"
And all indexing jobs have been run
Expand All @@ -86,9 +117,38 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I am on bad_user's bookmarks page
Then I should not see "Rude comment"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario Outline: Deleting bookmarks
Given I am logged in as "regular_user" with password "password1"
And I post the work "A Nice Work"
When I am logged in as "bad_user"
And I view the work "A Nice Work"
When I follow "Bookmark"
And I fill in "bookmark_notes" with "Rude comment"
And I press "Create"
And all indexing jobs have been run
Then I should see "Bookmark was successfully created"
When I am logged in as a "<role>" admin
And I am on bad_user's bookmarks page
And I follow "Delete Bookmark"
Then I should see "Item was successfully deleted."
When I am logged in as "bad_user"
And I am on bad_user's bookmarks page
Then I should not see "Rude comment"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario: Can edit tags on works
Given basic tags
And I am logged in as "regular_user"
Given I am logged in as "regular_user"
And I post the work "Changes" with fandom "User-Added Fandom" with freeform "User-Added Freeform" with category "M/M"
When I am logged in as a "policy_and_abuse" admin
And I view the work "Changes"
Expand Down Expand Up @@ -124,8 +184,7 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I should not see "Admin-Added Fandom"

Scenario: Can edit external works
Given basic tags
And basic languages
Given basic languages
And I am logged in as "regular_user"
And I bookmark the external work "External Changes"
When I am logged in as a "policy_and_abuse" admin
Expand Down Expand Up @@ -155,15 +214,37 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I should see "M/M"
And I should see "Language: Deutsch"

Scenario: Can delete external works
Given basic tags
And I am logged in as "regular_user"
Scenario Outline: Hiding and un-hiding external works
Given I am logged in as "regular_user"
And I bookmark the external work "External Changes"
When I am logged in as a "policy_and_abuse" admin
When I am logged in as a "<role>" admin
And I view the external work "External Changes"
And I follow "Hide External Work"
Then I should see "Item has been hidden."
And I should see "Make External Work Visible"
When I follow "Make External Work Visible"
Then I should see "Item is no longer hidden."

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario Outline: Deleting external works
Given I am logged in as "regular_user"
And I bookmark the external work "External Changes"
When I am logged in as a "<role>" admin
And I view the external work "External Changes"
And I follow "Delete External Work"
Then I should see "Item was successfully deleted."

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario: Can mark a comment as spam
Given I have no works or comments
And the following activated users exist
Expand Down Expand Up @@ -250,8 +331,7 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I should not see "This comment has been marked as spam."

Scenario: Admin can edit language on works when posting without previewing
Given basic tags
And basic languages
Given basic languages
And I am logged in as "regular_user"
And I post the work "Wrong Language"
When I am logged in as a "policy_and_abuse" admin
Expand All @@ -264,8 +344,7 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I should not see "English"

Scenario: Admin can edit language on works when previewing first
Given basic tags
And basic languages
Given basic languages
And I am logged in as "regular_user"
And I post the work "Wrong Language"
When I am logged in as a "policy_and_abuse" admin
Expand Down Expand Up @@ -300,10 +379,10 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And the work "Spammity Spam" should not be marked as spam
And the work "Spammity Spam" should not be hidden

Scenario: Admin can hide a series (e.g. if the series description or notes contain a TOS Violation)
Scenario Outline: Admin can hide a series (e.g. if the series description or notes contain a TOS Violation)
Given I am logged in as "tosser"
And I add the work "Legit Work" to series "Violation"
When I am logged in as a "policy_and_abuse" admin
When I am logged in as a "<role>" admin
And I view the series "Violation"
And I follow "Hide Series"
Then I should see "Item has been hidden."
Expand All @@ -328,10 +407,16 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
When I view the series "Violation"
Then I should see the image "title" text "Hidden by Administrator"

Scenario: Admin can un-hide a series
Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario Outline: Admin can un-hide a series
Given I am logged in as "tosser"
And I add the work "Legit Work" to series "Violation"
And I am logged in as a "policy_and_abuse" admin
And I am logged in as a "<role>" admin
And I view the series "Violation"
And I follow "Hide Series"
When I follow "Make Series Visible"
Expand All @@ -357,6 +442,30 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
When I view the series "Violation"
Then I should see "Violation"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario Outline: Deleting series
Given I am logged in as "tosser"
And I add the work "Legit Work" to series "Violation"
And I am logged in as a "<role>" admin
When I view the series "Violation"
And I follow "Delete Series"
Then I should see "Item was successfully deleted."
When I log out
And I go to tosser's series page
Then I should see "Series (0)"
And I should not see "Violation"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |

Scenario: Admins can see when a work has too many tags
Given the user-defined tag limit is 7
And the work "Under the Limit"
Expand All @@ -371,8 +480,14 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
When I view the work "Over the Limit"
Then I should see "Over Tag Limit: Yes"

Scenario: Policy abuse admins can see original work creators
Scenario Outline: Certain admins can see original work creators
Given a work "Orphaned" with the original creator "orphaneer"
When I am logged in as a "policy_and_abuse" admin
When I am logged in as a "<role>" admin
And I view the work "Orphaned"
Then I should see the original creator "orphaneer"

Examples:
| role |
| superadmin |
| legal |
| policy_and_abuse |
1 change: 1 addition & 0 deletions features/comments_and_kudos/admin_info.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Feature: Some admins can see IP addresses and emails for comments
Examples:
| role | should_ip | should_email |
| superadmin | should | should |
| legal | should | should |
| policy_and_abuse | should | should |
| support | should not | should |
| board | should not | should not |
Expand Down
Loading
Loading