Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions app/controllers/members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def unsubscribe
session[:member_id] = member.id

authenticate_member!

redirect_to subscriptions_path
redirect_to subscriptions_path unless performed?
rescue StandardError
redirect_to root_path, notice: 'Your token is invalid. '
end
Expand Down
7 changes: 7 additions & 0 deletions spec/controllers/members_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
expect(response).to redirect_to(subscriptions_path)
end

it 'does not render twice when the member has incomplete details' do
member = Fabricate.build(:member, about_you: nil)
member.save(validate: false)
get :unsubscribe, params: { token: member_token(member) }
expect(response).to redirect_to(edit_member_details_path)
end

it 'redirects to the root path when token is invalid' do
get :unsubscribe, params: { token: 'foo' }
expect(response).to redirect_to(root_path)
Expand Down