cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/5465'

Browse source
This commit is contained in:
Tom Hughes 2025-01-05 16:09:32 +00:00
commit af9d4f2696
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/messages_controller.rb
View file

@ -49,7 +49,7 @@ class MessagesController < ApplicationController
elsif @message.save elsif @message.save
flash[:notice] = t ".message_sent" flash[:notice] = t ".message_sent"
UserMailer.message_notification(@message).deliver_later if @message.notify_recipient? UserMailer.message_notification(@message).deliver_later if @message.notify_recipient?
redirect_to messages_inbox_path redirect_to messages_outbox_path
else else
@title = t "messages.new.title" @title = t "messages.new.title"
render :action => "new" render :action => "new"

2
test/controllers/messages_controller_test.rb
View file

@ -163,7 +163,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
end end
end end
end end
assert_redirected_to messages_inbox_path assert_redirected_to messages_outbox_path
assert_equal "Message sent", flash[:notice] assert_equal "Message sent", flash[:notice]
e = ActionMailer::Base.deliveries.first e = ActionMailer::Base.deliveries.first
assert_equal [recipient_user.email], e.to assert_equal [recipient_user.email], e.to