Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5465'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Jan 5, 2025
2 parents 95b919c + 3350789 commit af9d4f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def create
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"
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/messages_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def test_new_post_send
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
Expand Down

0 comments on commit af9d4f2

Please sign in to comment.