Skip to content

Redirect instead of a 500 when the waiting-list entry is already gone #2998

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

Merged
olleolleolle merged 2 commits into from
Oct 11, 2026
Merged

Redirect instead of a 500 when the waiting-list entry is already gone #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2834634
fix: redirect instead of raising when the waiting-list entry is gone
mroderick Oct 9, 2026
ddf03a1
Merge branch 'master' into fix/waiting-list-destroy-missing-entry
olleolleolle Oct 11, 2026
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
8 changes: 7 additions & 1 deletion app/controllers/waiting_lists_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ def create # rubocop:disable Metrics/MethodLength
end

def destroy
WaitingList.find_by(invitation_id: @invitation.id).destroy
entry = WaitingList.find_by(invitation_id: @invitation.id)
unless entry
return redirect_to(invitation_path(@invitation),
notice: 'You are not on the waiting list')
end

entry.destroy
MemberActivityRecorder.record(actor: @invitation.member, key: 'waiting_list.left',
trackable: @invitation)

Expand Down
15 changes: 15 additions & 0 deletions spec/controllers/waiting_lists_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@
end

describe 'DELETE #destroy' do
context 'when the waiting-list entry is already gone' do
it 'redirects with a notice instead of raising' do
delete :destroy, params: { invitation_id: invitation.token }

expect(response).to redirect_to(invitation_path(invitation))
expect(flash[:notice]).to eq('You are not on the waiting list')
end

it 'does not record a "waiting_list.left" activity' do
delete :destroy, params: { invitation_id: invitation.token }

expect(PublicActivity::Activity.where(key: 'waiting_list.left')).to be_empty
end
end

context 'without a CSRF token (browser did not send session cookie)' do
include_context 'with forgery protection enforced'

Expand Down
Loading