Skip to content

AO3-5963 Fix that invitation requests would get stuck if invitation had invalid email #5565

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

Open
Bilka2 wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

AO3-5963 Fix that invitation requests would get stuck if invitation had invalid email #5565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions app/models/invite_request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ def compare_with_users
def invite_and_remove(creator=nil)
invitation = creator ? creator.invitations.build(invitee_email: self.email, from_queue: true) :
Invitation.new(invitee_email: self.email, from_queue: true)
if invitation.save
self.destroy
end
invitation.save
self.destroy
end
end
17 changes: 17 additions & 0 deletions features/other_a/invite_queue.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,20 @@ Feature: Invite queue management

When I press "Resend Invitation"
Then 1 email should be delivered to invitee@example.org

Scenario: Invitation requests don't get stuck in the queue if a user changes their email to the requests' email
Given account creation is enabled
And the invitation queue is enabled
And account creation requires an invitation
And the invite_from_queue_at is yesterday
And an invitation request for "test@archiveofourown.org"
And the following activated users exist
| login | email |
| fred | nottest@archiveofourown.org |
When I am logged in as "fred"
And I change my email to "test@archiveofourown.org"
And all emails have been delivered
And the scheduled check_invite_queue job is run
And I go to the invite_requests page
Then I should see "There are currently 0 people on the waiting list"
And 0 emails should be delivered to test@archiveofourown.org
Loading