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-6502 Blocked users should not be able to give gift works to blocker #4721

Merged
merged 19 commits into from
Mar 24, 2024
Merged

AO3-6502 Blocked users should not be able to give gift works to blocker #4721

merged 19 commits into from
Mar 24, 2024

Conversation

ceithir
Copy link
Contributor

@ceithir ceithir commented Jan 20, 2024

Pull Request Checklist

Issue

https://otwarchive.atlassian.net/browse/AO3-6502

Purpose

Prevent users from being given gifts by users they've blocked.

Testing Instructions

See Jira.

Credit

Ceithir (he/him)

@Bilka2
Copy link
Contributor

Bilka2 commented Jan 21, 2024 •
edited
Loading

This is missing the exception for gift exchanges:

For now, this should have the same exceptions as having gifts disabled: gifts that are filling a challenge claim or assignment should be allowed (AO3-6257).

I locally checked this with some tests. Here is the code for those, based on the other tests in features/gift_exchanges/challenge_giftexchange.feature:

  Scenario: If a work is connected to an assignment for a user who blocked the gifter,
  user is still automatically added as a gift recipient. The recipient
  remains attached even if the work is later disconnected from the assignment.
    Given basic tags
      And the user "recip" exists and is activated
      And the user "recip" allows gifts
      And the user "recip" has blocked the user "gifter"
      And I am logged in as "gifter"
      And I have an assignment for the user "recip" in the collection "exchange_collection"
    When I fulfill my assignment
    Then I should see "For recip."
    When I follow "Edit"
      And I uncheck "exchange_collection (recip)"
      And I press "Post"
    Then I should see "For recip."

  Scenario: A user can explicitly give a gift to a user who blocked the gifter if
  the work is connected to an assignment. The recipient remains attached even if
  the work is later disconnected from the assignment.
    Given basic tags
      And the user "recip" exists and is activated
      And the user "recip" allows gifts
      And the user "recip" has blocked the user "gifter"
      And I am logged in as "gifter"
      And I have an assignment for the user "recip" in the collection "exchange_collection"
    When I start to fulfill my assignment
      And I fill in "Gift this work to" with "recip"
      And I press "Post"
    Then I should see "For recip."
    When I follow "Edit"
      And I uncheck "exchange_collection (recip)"
      And I press "Post"
    Then I should see "For recip."

Similar tests would be good for prompt memes (there they can also be copied from the general gift preference tests).

A test that a recip can refuse a gift from a gifter after blocking the gifter may also be nice (based on gift.feature:324).

Bilka2
Bilka2 requested changes Jan 27, 2024
View reviewed changes
Bilka2
Bilka2 reviewed Jan 27, 2024
View reviewed changes
Bilka2
Bilka2 approved these changes Jan 27, 2024
View reviewed changes
Copy link
Contributor

@Bilka2 Bilka2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@Bilka2
Copy link
Contributor

Bilka2 commented Feb 14, 2024

To give context on the Reviewed: Action Needed label: The Jira ticket was updated with the needed text changes for the blocked user page/confirmation page, which should be included in this PR.

@brianjaustin brianjaustin merged commit 323abe1 into otwcode:master Mar 24, 2024
26 checks passed
@ceithir ceithir deleted the AO3-6502 branch April 5, 2024 16:34
@Bilka2 Bilka2 mentioned this pull request Dec 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weeklies weeklies weeklies left review comments

@Bilka2 Bilka2 Bilka2 approved these changes

Assignees
No one assigned
Labels
Reviewed: Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ceithir @Bilka2 @weeklies @brianjaustin