From: Tom Hughes Date: Sun, 5 Jan 2025 16:09:32 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5465' X-Git-Tag: live~35 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/af9d4f26962f7cdf30eef6bdfe53034df55598e4?hp=95b919c5d1e33688b0841c7d38602372c2e4c4a3 Merge remote-tracking branch 'upstream/pull/5465' --- diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 26e8a5e09..cc5f6c56d 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -49,7 +49,7 @@ class MessagesController < ApplicationController elsif @message.save flash[:notice] = t ".message_sent" UserMailer.message_notification(@message).deliver_later if @message.notify_recipient? - redirect_to messages_inbox_path + redirect_to messages_outbox_path else @title = t "messages.new.title" render :action => "new" diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 924990892..b2bb71b1c 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -163,7 +163,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest end end end - assert_redirected_to messages_inbox_path + assert_redirected_to messages_outbox_path assert_equal "Message sent", flash[:notice] e = ActionMailer::Base.deliveries.first assert_equal [recipient_user.email], e.to