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

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-02 18:50:39 +00:00
commit 7286ad027c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/routes.rb
View file

@ -311,7 +311,7 @@ OpenStreetMap::Application.routes.draw do
get "/export/embed" => "export#embed" get "/export/embed" => "export#embed"
# messages # messages
resources :messages, :id => /\d+/, :only => [:create, :show, :destroy] do resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do
post :mark post :mark
patch :unmute patch :unmute
@ -324,7 +324,7 @@ OpenStreetMap::Application.routes.draw do
end end
get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox") get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox") get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
get "/message/new/:display_name" => "messages#new", :as => "new_message" get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}") get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
# muting users # muting users

2
test/controllers/messages_controller_test.rb
View file

@ -5,7 +5,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
# test all routes which lead to this controller # test all routes which lead to this controller
def test_routes def test_routes
assert_routing( assert_routing(
{ :path => "/message/new/username", :method => :get }, { :path => "/messages/new/username", :method => :get },
{ :controller => "messages", :action => "new", :display_name => "username" } { :controller => "messages", :action => "new", :display_name => "username" }
) )
assert_routing( assert_routing(