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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-18 13:54:12 +00:00
commit 7d4cc85a31
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config/routes.rb
View file

@ -77,18 +77,17 @@ OpenStreetMap::Application.routes.draw do
put "" => "user_preferences#update_all", :as => "" put "" => "user_preferences#update_all", :as => ""
end end
end end
end
resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do namespace :api, :path => "api/0.6" do
resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do
collection do collection do
get "inbox" get "inbox"
get "outbox" get "outbox"
end end
end end
post "/user/messages/:id" => "messages#update"
post "/user/messages/:id" => "messages#update", :as => :api_message_update
end
namespace :api, :path => "api/0.6" do
resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
scope :module => :traces do scope :module => :traces do
resource :data, :only => :show resource :data, :only => :show

30
test/controllers/api/messages_controller_test.rb
View file

@ -46,9 +46,13 @@ module Api
{ :controller => "api/messages", :action => "create" } { :controller => "api/messages", :action => "create" }
) )
assert_routing( assert_routing(
{ :path => "/api/0.6/user/messages/1", :method => :post }, { :path => "/api/0.6/user/messages/1", :method => :put },
{ :controller => "api/messages", :action => "update", :id => "1" } { :controller => "api/messages", :action => "update", :id => "1" }
) )
assert_recognizes(
{ :controller => "api/messages", :action => "update", :id => "1" },
{ :path => "/api/0.6/user/messages/1", :method => :post }
)
assert_routing( assert_routing(
{ :path => "/api/0.6/user/messages/1", :method => :delete }, { :path => "/api/0.6/user/messages/1", :method => :delete },
{ :controller => "api/messages", :action => "destroy", :id => "1" } { :controller => "api/messages", :action => "destroy", :id => "1" }
@ -253,27 +257,27 @@ module Api
msg = create(:message, :unread, :sender => sender, :recipient => recipient) msg = create(:message, :unread, :sender => sender, :recipient => recipient)
# attempt to mark message as read by recipient, not authenticated # attempt to mark message as read by recipient, not authenticated
post api_message_path(:id => msg.id), :params => { :read_status => true } put api_message_path(:id => msg.id), :params => { :read_status => true }
assert_response :unauthorized assert_response :unauthorized
# attempt to mark message as read by recipient, not allowed # attempt to mark message as read by recipient, not allowed
post api_message_path(:id => msg.id), :params => { :read_status => true }, :headers => user3_auth put api_message_path(:id => msg.id), :params => { :read_status => true }, :headers => user3_auth
assert_response :forbidden assert_response :forbidden
# missing parameter # missing parameter
post api_message_path(:id => msg.id), :headers => recipient_auth put api_message_path(:id => msg.id), :headers => recipient_auth
assert_response :bad_request assert_response :bad_request
# wrong type of parameter # wrong type of parameter
post api_message_path(:id => msg.id), put api_message_path(:id => msg.id),
:params => { :read_status => "not a boolean" }, :params => { :read_status => "not a boolean" },
:headers => recipient_auth :headers => recipient_auth
assert_response :bad_request assert_response :bad_request
# mark message as read by recipient # mark message as read by recipient
post api_message_path(:id => msg.id, :format => "json"), put api_message_path(:id => msg.id, :format => "json"),
:params => { :read_status => true }, :params => { :read_status => true },
:headers => recipient_auth :headers => recipient_auth
assert_response :success assert_response :success
assert_equal "application/json", response.media_type assert_equal "application/json", response.media_type
js = ActiveSupport::JSON.decode(@response.body) js = ActiveSupport::JSON.decode(@response.body)
@ -292,9 +296,9 @@ module Api
assert_equal msg.body, jsm["body"] assert_equal msg.body, jsm["body"]
# mark message as unread by recipient # mark message as unread by recipient
post api_message_path(:id => msg.id, :format => "json"), put api_message_path(:id => msg.id, :format => "json"),
:params => { :read_status => false }, :params => { :read_status => false },
:headers => recipient_auth :headers => recipient_auth
assert_response :success assert_response :success
assert_equal "application/json", response.media_type assert_equal "application/json", response.media_type
js = ActiveSupport::JSON.decode(@response.body) js = ActiveSupport::JSON.decode(@response.body)