X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9adad9f90df122de58ffde3818c8b6c46d2d4b01..ae00fa84c8f981e909c61ab31b6115bb96e859cc:/test/controllers/api/notes_controller_test.rb?ds=sidebyside diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb index d6759e192..5f69e6a2a 100644 --- a/test/controllers/api/notes_controller_test.rb +++ b/test/controllers/api/notes_controller_test.rb @@ -14,11 +14,11 @@ module Api def test_routes assert_routing( { :path => "/api/0.6/notes", :method => :post }, - { :controller => "api/notes", :action => "create", :format => "xml" } + { :controller => "api/notes", :action => "create" } ) assert_routing( { :path => "/api/0.6/notes/1", :method => :get }, - { :controller => "api/notes", :action => "show", :id => "1", :format => "xml" } + { :controller => "api/notes", :action => "show", :id => "1" } ) assert_recognizes( { :controller => "api/notes", :action => "show", :id => "1", :format => "xml" }, @@ -38,24 +38,24 @@ module Api ) assert_routing( { :path => "/api/0.6/notes/1/comment", :method => :post }, - { :controller => "api/notes", :action => "comment", :id => "1", :format => "xml" } + { :controller => "api/notes", :action => "comment", :id => "1" } ) assert_routing( { :path => "/api/0.6/notes/1/close", :method => :post }, - { :controller => "api/notes", :action => "close", :id => "1", :format => "xml" } + { :controller => "api/notes", :action => "close", :id => "1" } ) assert_routing( { :path => "/api/0.6/notes/1/reopen", :method => :post }, - { :controller => "api/notes", :action => "reopen", :id => "1", :format => "xml" } + { :controller => "api/notes", :action => "reopen", :id => "1" } ) assert_routing( { :path => "/api/0.6/notes/1", :method => :delete }, - { :controller => "api/notes", :action => "destroy", :id => "1", :format => "xml" } + { :controller => "api/notes", :action => "destroy", :id => "1" } ) assert_routing( { :path => "/api/0.6/notes", :method => :get }, - { :controller => "api/notes", :action => "index", :format => "xml" } + { :controller => "api/notes", :action => "index" } ) assert_recognizes( { :controller => "api/notes", :action => "index", :format => "xml" }, @@ -76,7 +76,7 @@ module Api assert_routing( { :path => "/api/0.6/notes/search", :method => :get }, - { :controller => "api/notes", :action => "search", :format => "xml" } + { :controller => "api/notes", :action => "search" } ) assert_recognizes( { :controller => "api/notes", :action => "search", :format => "xml" }, @@ -99,33 +99,14 @@ module Api { :path => "/api/0.6/notes/feed", :method => :get }, { :controller => "api/notes", :action => "feed", :format => "rss" } ) - - assert_recognizes( - { :controller => "api/notes", :action => "create" }, - { :path => "/api/0.6/notes/addPOIexec", :method => :post } - ) - assert_recognizes( - { :controller => "api/notes", :action => "close" }, - { :path => "/api/0.6/notes/closePOIexec", :method => :post } - ) - assert_recognizes( - { :controller => "api/notes", :action => "comment" }, - { :path => "/api/0.6/notes/editPOIexec", :method => :post } - ) - assert_recognizes( - { :controller => "api/notes", :action => "index", :format => "gpx" }, - { :path => "/api/0.6/notes/getGPX", :method => :get } - ) - assert_recognizes( - { :controller => "api/notes", :action => "feed", :format => "rss" }, - { :path => "/api/0.6/notes/getRSSfeed", :method => :get } - ) end - def test_create_success + def test_create_anonymous_success assert_difference "Note.count", 1 do assert_difference "NoteComment.count", 1 do - post notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json") + assert_no_difference "NoteSubscription.count" do + post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json") + end end end assert_response :success @@ -141,7 +122,7 @@ module Api assert_nil js["properties"]["comments"].last["user"] id = js["properties"]["id"] - get note_path(:id => id, :format => "json") + get api_note_path(id, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -156,79 +137,109 @@ module Api assert_nil js["properties"]["comments"].last["user"] end - def test_create_fail + def test_create_anonymous_fail assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lon => -1.0, :text => "This is a comment") + post api_notes_path(:lon => -1.0, :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :text => "This is a comment") + post api_notes_path(:lat => -1.0, :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :lon => -1.0) + post api_notes_path(:lat => -1.0, :lon => -1.0) end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :lon => -1.0, :text => "") + post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -100.0, :lon => -1.0, :text => "This is a comment") + post api_notes_path(:lat => -100.0, :lon => -1.0, :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :lon => -200.0, :text => "This is a comment") + post api_notes_path(:lat => -1.0, :lon => -200.0, :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => "abc", :lon => -1.0, :text => "This is a comment") + post api_notes_path(:lat => "abc", :lon => -1.0, :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :lon => "abc", :text => "This is a comment") + post api_notes_path(:lat => -1.0, :lon => "abc", :text => "This is a comment") end end assert_response :bad_request assert_no_difference "Note.count" do assert_no_difference "NoteComment.count" do - post notes_path(:lat => -1.0, :lon => -1.0, :text => "x\u0000y") + post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "x\u0000y") end end assert_response :bad_request end + def test_create_success + user = create(:user) + auth_header = bearer_authorization_header user + assert_difference "Note.count", 1 do + assert_difference "NoteComment.count", 1 do + assert_difference "NoteSubscription.count", 1 do + post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json"), :headers => auth_header + end + end + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal "Point", js["geometry"]["type"] + assert_equal [-1.0, -1.0], js["geometry"]["coordinates"] + assert_equal "open", js["properties"]["status"] + assert_equal 1, js["properties"]["comments"].count + assert_equal "opened", js["properties"]["comments"].last["action"] + assert_equal "This is a comment", js["properties"]["comments"].last["text"] + assert_equal user.display_name, js["properties"]["comments"].last["user"] + + note = Note.last + subscription = NoteSubscription.last + assert_equal user, subscription.user + assert_equal note, subscription.note + end + def test_comment_success open_note_with_comment = create(:note_with_comments) user = create(:user) - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user assert_difference "NoteComment.count", 1 do - assert_no_difference "ActionMailer::Base.deliveries.size" do - perform_enqueued_jobs do - post comment_note_path(:id => open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header + assert_difference "NoteSubscription.count", 1 do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post comment_api_note_path(open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header + end end end end @@ -243,7 +254,11 @@ module Api assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] - get note_path(:id => open_note_with_comment, :format => "json") + subscription = NoteSubscription.last + assert_equal user, subscription.user + assert_equal open_note_with_comment, subscription.note + + get api_note_path(open_note_with_comment, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -254,7 +269,61 @@ module Api assert_equal "commented", js["properties"]["comments"].last["action"] assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] + end + + def test_comment_without_notifications_success + # Ensure that emails are sent to users + first_user = create(:user) + second_user = create(:user) + third_user = create(:user) + + note_with_comments_by_users = create(:note) do |note| + create(:note_comment, :note => note, :author => first_user) + create(:note_comment, :note => note, :author => second_user) + end + + auth_header = bearer_authorization_header third_user + + assert_difference "NoteComment.count", 1 do + assert_difference "NoteSubscription.count", 1 do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post comment_api_note_path(note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header + end + end + end + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal note_with_comments_by_users.id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "commented", js["properties"]["comments"].last["action"] + assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] + assert_equal third_user.display_name, js["properties"]["comments"].last["user"] + + subscription = NoteSubscription.last + assert_equal third_user, subscription.user + assert_equal note_with_comments_by_users, subscription.note + + get api_note_path(note_with_comments_by_users, :format => "json") + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal note_with_comments_by_users.id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "commented", js["properties"]["comments"].last["action"] + assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] + assert_equal third_user.display_name, js["properties"]["comments"].last["user"] + ActionMailer::Base.deliveries.clear + end + + def test_comment_with_notifications_success # Ensure that emails are sent to users first_user = create(:user) second_user = create(:user) @@ -264,13 +333,17 @@ module Api create(:note_comment, :note => note, :author => first_user) create(:note_comment, :note => note, :author => second_user) end + create(:note_subscription, :note => note_with_comments_by_users, :user => first_user) + create(:note_subscription, :note => note_with_comments_by_users, :user => second_user) - auth_header = basic_authorization_header third_user.email, "test" + auth_header = bearer_authorization_header third_user assert_difference "NoteComment.count", 1 do - assert_difference "ActionMailer::Base.deliveries.size", 2 do - perform_enqueued_jobs do - post comment_note_path(:id => note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header + assert_difference "NoteSubscription.count", 1 do + assert_difference "ActionMailer::Base.deliveries.size", 2 do + perform_enqueued_jobs do + post comment_api_note_path(note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header + end end end end @@ -285,6 +358,10 @@ module Api assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] assert_equal third_user.display_name, js["properties"]["comments"].last["user"] + subscription = NoteSubscription.last + assert_equal third_user, subscription.user + assert_equal note_with_comments_by_users, subscription.note + email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email } assert_not_nil email assert_equal 1, email.to.length @@ -296,7 +373,7 @@ module Api assert_equal 1, email.to.length assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject - get note_path(:id => note_with_comments_by_users, :format => "json") + get api_note_path(note_with_comments_by_users, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -311,49 +388,86 @@ module Api ActionMailer::Base.deliveries.clear end + def test_comment_twice_success + open_note_with_comment = create(:note_with_comments) + user = create(:user) + auth_header = bearer_authorization_header user + assert_difference "NoteComment.count", 1 do + assert_difference "NoteSubscription.count", 1 do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post comment_api_note_path(open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header + end + end + end + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 2, js["properties"]["comments"].count + + subscription = NoteSubscription.last + assert_equal user, subscription.user + assert_equal open_note_with_comment, subscription.note + + assert_difference "NoteComment.count", 1 do + assert_no_difference "NoteSubscription.count" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post comment_api_note_path(open_note_with_comment, :text => "This is a second additional comment", :format => "json"), :headers => auth_header + end + end + end + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 3, js["properties"]["comments"].count + end + def test_comment_fail open_note_with_comment = create(:note_with_comments) user = create(:user) assert_no_difference "NoteComment.count" do - post comment_note_path(:id => open_note_with_comment) + post comment_api_note_path(open_note_with_comment) assert_response :unauthorized end - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user assert_no_difference "NoteComment.count" do - post comment_note_path(:id => open_note_with_comment), :headers => auth_header + post comment_api_note_path(open_note_with_comment), :headers => auth_header end assert_response :bad_request assert_no_difference "NoteComment.count" do - post comment_note_path(:id => open_note_with_comment, :text => ""), :headers => auth_header + post comment_api_note_path(open_note_with_comment, :text => ""), :headers => auth_header end assert_response :bad_request assert_no_difference "NoteComment.count" do - post comment_note_path(:id => 12345, :text => "This is an additional comment"), :headers => auth_header + post comment_api_note_path(12345, :text => "This is an additional comment"), :headers => auth_header end assert_response :not_found hidden_note_with_comment = create(:note_with_comments, :status => "hidden") assert_no_difference "NoteComment.count" do - post comment_note_path(:id => hidden_note_with_comment, :text => "This is an additional comment"), :headers => auth_header + post comment_api_note_path(hidden_note_with_comment, :text => "This is an additional comment"), :headers => auth_header end assert_response :gone - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) + closed_note_with_comment = create(:note_with_comments, :closed) assert_no_difference "NoteComment.count" do - post comment_note_path(:id => closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header + post comment_api_note_path(closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header end assert_response :conflict assert_no_difference "NoteComment.count" do - post comment_note_path(:id => open_note_with_comment, :text => "x\u0000y"), :headers => auth_header + post comment_api_note_path(open_note_with_comment, :text => "x\u0000y"), :headers => auth_header end assert_response :bad_request end @@ -362,12 +476,14 @@ module Api open_note_with_comment = create(:note_with_comments) user = create(:user) - post close_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json") + post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json") assert_response :unauthorized - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user - post close_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header + assert_difference "NoteSubscription.count", 1 do + post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header + end assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -379,7 +495,11 @@ module Api assert_equal "This is a close comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] - get note_path(:id => open_note_with_comment.id, :format => "json") + subscription = NoteSubscription.last + assert_equal user, subscription.user + assert_equal open_note_with_comment, subscription.note + + get api_note_path(open_note_with_comment.id, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -393,54 +513,60 @@ module Api end def test_close_fail - post close_note_path(:id => 12345) + post close_api_note_path(12345) assert_response :unauthorized - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header - post close_note_path(:id => 12345), :headers => auth_header + post close_api_note_path(12345), :headers => auth_header assert_response :not_found hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - post close_note_path(:id => hidden_note_with_comment), :headers => auth_header + post close_api_note_path(hidden_note_with_comment), :headers => auth_header assert_response :gone - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) + closed_note_with_comment = create(:note_with_comments, :closed) - post close_note_path(:id => closed_note_with_comment), :headers => auth_header + post close_api_note_path(closed_note_with_comment), :headers => auth_header assert_response :conflict end def test_reopen_success - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) + closed_note_with_comment = create(:note_with_comments, :closed) user = create(:user) - post reopen_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json") + post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json") assert_response :unauthorized - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user - post reopen_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header + assert_difference "NoteSubscription.count", 1 do + post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header + end assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js assert_equal "Feature", js["type"] assert_equal closed_note_with_comment.id, js["properties"]["id"] assert_equal "open", js["properties"]["status"] - assert_equal 2, js["properties"]["comments"].count + assert_equal 3, js["properties"]["comments"].count assert_equal "reopened", js["properties"]["comments"].last["action"] assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] - get note_path(:id => closed_note_with_comment, :format => "json") + subscription = NoteSubscription.last + assert_equal user, subscription.user + assert_equal closed_note_with_comment, subscription.note + + get api_note_path(closed_note_with_comment, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js assert_equal "Feature", js["type"] assert_equal closed_note_with_comment.id, js["properties"]["id"] assert_equal "open", js["properties"]["status"] - assert_equal 2, js["properties"]["comments"].count + assert_equal 3, js["properties"]["comments"].count assert_equal "reopened", js["properties"]["comments"].last["action"] assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] @@ -449,35 +575,35 @@ module Api def test_reopen_fail hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - post reopen_note_path(:id => hidden_note_with_comment) + post reopen_api_note_path(hidden_note_with_comment) assert_response :unauthorized - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header - post reopen_note_path(:id => 12345), :headers => auth_header + post reopen_api_note_path(12345), :headers => auth_header assert_response :not_found - post reopen_note_path(:id => hidden_note_with_comment), :headers => auth_header + post reopen_api_note_path(hidden_note_with_comment), :headers => auth_header assert_response :gone open_note_with_comment = create(:note_with_comments) - post reopen_note_path(:id => open_note_with_comment), :headers => auth_header + post reopen_api_note_path(open_note_with_comment), :headers => auth_header assert_response :conflict end def test_show_success open_note = create(:note_with_comments) - get note_path(:id => open_note, :format => "xml") + get api_note_path(open_note, :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note[lat='#{open_note.lat}'][lon='#{open_note.lon}']", :count => 1 do assert_select "id", open_note.id.to_s - assert_select "url", note_url(open_note, :format => "xml") - assert_select "comment_url", comment_note_url(open_note, :format => "xml") - assert_select "close_url", close_note_url(open_note, :format => "xml") + assert_select "url", api_note_url(open_note, :format => "xml") + assert_select "comment_url", comment_api_note_url(open_note, :format => "xml") + assert_select "close_url", close_api_note_url(open_note, :format => "xml") assert_select "date_created", open_note.created_at.to_s assert_select "status", open_note.status assert_select "comments", :count => 1 do @@ -486,23 +612,23 @@ module Api end end - get note_path(:id => open_note, :format => "rss") + get api_note_path(open_note, :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do assert_select "item", :count => 1 do - assert_select "link", browse_note_url(open_note) - assert_select "guid", note_url(open_note) + assert_select "link", note_url(open_note) + assert_select "guid", api_note_url(open_note) assert_select "pubDate", open_note.created_at.to_fs(:rfc822) - # assert_select "geo:lat", open_note.lat.to_s - # assert_select "geo:long", open_note.lon - # assert_select "georss:point", "#{open_note.lon} #{open_note.lon}" + assert_select "geo|lat", open_note.lat.to_s + assert_select "geo|long", open_note.lon.to_s + assert_select "georss|point", "#{open_note.lon} #{open_note.lon}" end end end - get note_path(:id => open_note, :format => "json") + get api_note_path(open_note, :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -512,13 +638,13 @@ module Api assert_equal open_note.lat, js["geometry"]["coordinates"][0] assert_equal open_note.lon, js["geometry"]["coordinates"][1] assert_equal open_note.id, js["properties"]["id"] - assert_equal note_url(open_note, :format => "json"), js["properties"]["url"] - assert_equal comment_note_url(open_note, :format => "json"), js["properties"]["comment_url"] - assert_equal close_note_url(open_note, :format => "json"), js["properties"]["close_url"] + assert_equal api_note_url(open_note, :format => "json"), js["properties"]["url"] + assert_equal comment_api_note_url(open_note, :format => "json"), js["properties"]["comment_url"] + assert_equal close_api_note_url(open_note, :format => "json"), js["properties"]["close_url"] assert_equal open_note.created_at.to_s, js["properties"]["date_created"] assert_equal open_note.status, js["properties"]["status"] - get note_path(:id => open_note, :format => "gpx") + get api_note_path(open_note, :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -529,9 +655,9 @@ module Api assert_select "link[href='http://www.example.com/note/#{open_note.id}']", :count => 1 assert_select "extensions", :count => 1 do assert_select "id", open_note.id.to_s - assert_select "url", note_url(open_note, :format => "gpx") - assert_select "comment_url", comment_note_url(open_note, :format => "gpx") - assert_select "close_url", close_note_url(open_note, :format => "gpx") + assert_select "url", api_note_url(open_note, :format => "gpx") + assert_select "comment_url", comment_api_note_url(open_note, :format => "gpx") + assert_select "close_url", close_api_note_url(open_note, :format => "gpx") end end end @@ -544,7 +670,7 @@ module Api create(:note_comment, :note => note, :body => "Another valid comment for hidden note") end - get note_path(:id => note_with_hidden_comment, :format => "json") + get api_note_path(note_with_hidden_comment, :format => "json") assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -556,10 +682,10 @@ module Api end def test_show_fail - get note_path(:id => 12345) + get api_note_path(12345) assert_response :not_found - get note_path(:id => create(:note, :status => "hidden")) + get api_note_path(create(:note, :status => "hidden")) assert_response :gone end @@ -568,17 +694,17 @@ module Api user = create(:user) moderator_user = create(:moderator_user) - delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json") + delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json") assert_response :unauthorized - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user - delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header + delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header assert_response :forbidden - auth_header = basic_authorization_header moderator_user.email, "test" + auth_header = bearer_authorization_header moderator_user - delete note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header + delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js @@ -590,12 +716,12 @@ module Api assert_equal "This is a hide comment", js["properties"]["comments"].last["text"] assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"] - get note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header + get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header assert_response :success - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user - get note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header + get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header assert_response :gone end @@ -603,22 +729,22 @@ module Api user = create(:user) moderator_user = create(:moderator_user) - delete note_path(:id => 12345, :format => "json") + delete api_note_path(12345, :format => "json") assert_response :unauthorized - auth_header = basic_authorization_header user.email, "test" + auth_header = bearer_authorization_header user - delete note_path(:id => 12345, :format => "json"), :headers => auth_header + delete api_note_path(12345, :format => "json"), :headers => auth_header assert_response :forbidden - auth_header = basic_authorization_header moderator_user.email, "test" + auth_header = bearer_authorization_header moderator_user - delete note_path(:id => 12345, :format => "json"), :headers => auth_header + delete api_note_path(12345, :format => "json"), :headers => auth_header assert_response :not_found hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - delete note_path(:id => hidden_note_with_comment, :format => "json"), :headers => auth_header + delete api_note_path(hidden_note_with_comment, :format => "json"), :headers => auth_header assert_response :gone end @@ -627,16 +753,17 @@ module Api create(:note_with_comments, :latitude => position, :longitude => position) create(:note_with_comments, :latitude => position, :longitude => position) - get notes_path(:bbox => "1,1,1.2,1.2", :format => "rss") + get api_notes_path(:bbox => "1,1,1.2,1.2", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do + assert_select "description", :text => /1\.2/, :count => 1 assert_select "item", :count => 2 end end - get notes_path(:bbox => "1,1,1.2,1.2", :format => "json") + get api_notes_path(:bbox => "1,1,1.2,1.2", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -644,14 +771,14 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 2, js["features"].count - get notes_path(:bbox => "1,1,1.2,1.2", :format => "xml") + get api_notes_path(:bbox => "1,1,1.2,1.2", :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 2 end - get notes_path(:bbox => "1,1,1.2,1.2", :format => "gpx") + get api_notes_path(:bbox => "1,1,1.2,1.2", :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -664,7 +791,7 @@ module Api create(:note_with_comments, :latitude => position, :longitude => position) create(:note_with_comments, :latitude => position, :longitude => position) - get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss") + get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -673,7 +800,7 @@ module Api end end - get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "json") + get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -681,23 +808,26 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 1, js["features"].count - get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "xml") + get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 1 end - get notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "gpx") + get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => 1, :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do assert_select "wpt", :count => 1 end + + get api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit, :format => "rss") + assert_response :success end def test_index_empty_area - get notes_path(:bbox => "5,5,5.1,5.1", :format => "rss") + get api_notes_path(:bbox => "5,5,5.1,5.1", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -706,7 +836,7 @@ module Api end end - get notes_path(:bbox => "5,5,5.1,5.1", :format => "json") + get api_notes_path(:bbox => "5,5,5.1,5.1", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -714,14 +844,14 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 0, js["features"].count - get notes_path(:bbox => "5,5,5.1,5.1", :format => "xml") + get api_notes_path(:bbox => "5,5,5.1,5.1", :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 0 end - get notes_path(:bbox => "5,5,5.1,5.1", :format => "gpx") + get api_notes_path(:bbox => "5,5,5.1,5.1", :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -730,31 +860,31 @@ module Api end def test_index_large_area - get notes_path(:bbox => "-2.5,-2.5,2.5,2.5", :format => :json) + get api_notes_path(:bbox => "-2.5,-2.5,2.5,2.5", :format => :json) assert_response :success assert_equal "application/json", @response.media_type - get notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5", :t => "2.5", :format => :json) + get api_notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5", :t => "2.5", :format => :json) assert_response :success assert_equal "application/json", @response.media_type - get notes_path(:bbox => "-10,-10,12,12", :format => :json) + get api_notes_path(:bbox => "-10,-10,12,12", :format => :json) assert_response :bad_request assert_equal "text/plain", @response.media_type - get notes_path(:l => "-10", :b => "-10", :r => "12", :t => "12", :format => :json) + get api_notes_path(:l => "-10", :b => "-10", :r => "12", :t => "12", :format => :json) assert_response :bad_request assert_equal "text/plain", @response.media_type end def test_index_closed - create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 5.days) - create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 100.days) + create(:note_with_comments, :closed, :closed_at => Time.now.utc - 5.days) + create(:note_with_comments, :closed, :closed_at => Time.now.utc - 100.days) create(:note_with_comments, :status => "hidden") create(:note_with_comments) # Open notes + closed in last 7 days - get notes_path(:bbox => "1,1,1.7,1.7", :closed => "7", :format => "json") + get api_notes_path(:bbox => "1,1,1.7,1.7", :closed => "7", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -763,7 +893,7 @@ module Api assert_equal 2, js["features"].count # Only open notes - get notes_path(:bbox => "1,1,1.7,1.7", :closed => "0", :format => "json") + get api_notes_path(:bbox => "1,1,1.7,1.7", :closed => "0", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -772,7 +902,7 @@ module Api assert_equal 1, js["features"].count # Open notes + all closed notes - get notes_path(:bbox => "1,1,1.7,1.7", :closed => "-1", :format => "json") + get api_notes_path(:bbox => "1,1,1.7,1.7", :closed => "-1", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -782,42 +912,46 @@ module Api end def test_index_bad_params - get notes_path(:bbox => "-2.5,-2.5,2.5") + get api_notes_path + assert_response :bad_request + assert_equal "The parameter bbox is required", @response.body + + get api_notes_path(:bbox => "-2.5,-2.5,2.5") assert_response :bad_request - get notes_path(:bbox => "-2.5,-2.5,2.5,2.5,2.5") + get api_notes_path(:bbox => "-2.5,-2.5,2.5,2.5,2.5") assert_response :bad_request - get notes_path(:b => "-2.5", :r => "2.5", :t => "2.5") + get api_notes_path(:b => "-2.5", :r => "2.5", :t => "2.5") assert_response :bad_request - get notes_path(:l => "-2.5", :r => "2.5", :t => "2.5") + get api_notes_path(:l => "-2.5", :r => "2.5", :t => "2.5") assert_response :bad_request - get notes_path(:l => "-2.5", :b => "-2.5", :t => "2.5") + get api_notes_path(:l => "-2.5", :b => "-2.5", :t => "2.5") assert_response :bad_request - get notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5") + get api_notes_path(:l => "-2.5", :b => "-2.5", :r => "2.5") assert_response :bad_request - get notes_path(:bbox => "1,1,1.7,1.7", :limit => "0", :format => "json") + get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => "0", :format => "json") assert_response :bad_request - get notes_path(:bbox => "1,1,1.7,1.7", :limit => "10001", :format => "json") + get api_notes_path(:bbox => "1,1,1.7,1.7", :limit => Settings.max_note_query_limit + 1, :format => "json") assert_response :bad_request end def test_search_success create(:note_with_comments) - get search_notes_path(:q => "note comment", :format => "xml") + get search_api_notes_path(:q => "note comment", :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 1 end - get search_notes_path(:q => "note comment", :format => "json") + get search_api_notes_path(:q => "note comment", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -825,7 +959,7 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 1, js["features"].count - get search_notes_path(:q => "note comment", :format => "rss") + get search_api_notes_path(:q => "note comment", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -834,12 +968,15 @@ module Api end end - get search_notes_path(:q => "note comment", :format => "gpx") + get search_api_notes_path(:q => "note comment", :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do assert_select "wpt", :count => 1 end + + get search_api_notes_path(:q => "note comment", :limit => Settings.max_note_query_limit, :format => "xml") + assert_response :success end def test_search_by_display_name_success @@ -849,14 +986,14 @@ module Api create(:note_comment, :note => note, :author => user) end - get search_notes_path(:display_name => user.display_name, :format => "xml") + get search_api_notes_path(:display_name => user.display_name, :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 1 end - get search_notes_path(:display_name => user.display_name, :format => "json") + get search_api_notes_path(:display_name => user.display_name, :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -864,7 +1001,7 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 1, js["features"].count - get search_notes_path(:display_name => user.display_name, :format => "rss") + get search_api_notes_path(:display_name => user.display_name, :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -873,7 +1010,7 @@ module Api end end - get search_notes_path(:display_name => user.display_name, :format => "gpx") + get search_api_notes_path(:display_name => user.display_name, :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -888,14 +1025,14 @@ module Api create(:note_comment, :note => note, :author => user) end - get search_notes_path(:user => user.id, :format => "xml") + get search_api_notes_path(:user => user.id, :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 1 end - get search_notes_path(:user => user.id, :format => "json") + get search_api_notes_path(:user => user.id, :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -903,7 +1040,7 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 1, js["features"].count - get search_notes_path(:user => user.id, :format => "rss") + get search_api_notes_path(:user => user.id, :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -912,7 +1049,7 @@ module Api end end - get search_notes_path(:user => user.id, :format => "gpx") + get search_api_notes_path(:user => user.id, :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -920,17 +1057,39 @@ module Api end end + def test_search_by_bbox_success + notes = Array.new(5) do |i| + position = ((1.0 + (i * 0.1)) * GeoRecord::SCALE).to_i + create(:note_with_comments, :created_at => Time.parse("2020-01-01T00:00:00Z") + i.day, :latitude => position, :longitude => position) + end + + get search_api_notes_path(:bbox => "1.0,1.0,1.6,1.6", :sort => "created_at", :order => "oldest", :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_notes_in_order notes + + get search_api_notes_path(:bbox => "1.25,1.25,1.45,1.45", :sort => "created_at", :order => "oldest", :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_notes_in_order [notes[3], notes[4]] + + get search_api_notes_path(:bbox => "2.0,2.0,2.5,2.5", :sort => "created_at", :order => "oldest", :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_notes_in_order [] + end + def test_search_no_match create(:note_with_comments) - get search_notes_path(:q => "no match", :format => "xml") + get search_api_notes_path(:q => "no match", :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 0 end - get search_notes_path(:q => "no match", :format => "json") + get search_api_notes_path(:q => "no match", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -938,7 +1097,7 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 0, js["features"].count - get search_notes_path(:q => "no match", :format => "rss") + get search_api_notes_path(:q => "no match", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -947,7 +1106,7 @@ module Api end end - get search_notes_path(:q => "no match", :format => "gpx") + get search_api_notes_path(:q => "no match", :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -958,14 +1117,14 @@ module Api def test_search_by_time_no_match create(:note_with_comments) - get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "xml") + get search_api_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "xml") assert_response :success assert_equal "application/xml", @response.media_type assert_select "osm", :count => 1 do assert_select "note", :count => 0 end - get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "json") + get search_api_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "json") assert_response :success assert_equal "application/json", @response.media_type js = ActiveSupport::JSON.decode(@response.body) @@ -973,7 +1132,7 @@ module Api assert_equal "FeatureCollection", js["type"] assert_equal 0, js["features"].count - get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "rss") + get search_api_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -982,7 +1141,7 @@ module Api end end - get search_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "gpx") + get search_api_notes_path(:from => "01.01.2010", :to => "01.10.2010", :format => "gpx") assert_response :success assert_equal "application/gpx+xml", @response.media_type assert_select "gpx", :count => 1 do @@ -991,22 +1150,22 @@ module Api end def test_search_bad_params - get search_notes_path(:q => "no match", :limit => "0", :format => "json") + get search_api_notes_path(:q => "no match", :limit => "0", :format => "json") assert_response :bad_request - get search_notes_path(:q => "no match", :limit => "10001", :format => "json") + get search_api_notes_path(:q => "no match", :limit => Settings.max_note_query_limit + 1, :format => "json") assert_response :bad_request - get search_notes_path(:display_name => "non-existent") + get search_api_notes_path(:display_name => "non-existent") assert_response :bad_request - get search_notes_path(:user => "-1") + get search_api_notes_path(:user => "-1") assert_response :bad_request - get search_notes_path(:from => "wrong-date", :to => "wrong-date") + get search_api_notes_path(:from => "wrong-date", :to => "wrong-date") assert_response :bad_request - get search_notes_path(:from => "01.01.2010", :to => "2010.01.2010") + get search_api_notes_path(:from => "01.01.2010", :to => "2010.01.2010") assert_response :bad_request end @@ -1018,7 +1177,7 @@ module Api create(:note_with_comments, :latitude => position, :longitude => position) create(:note_with_comments, :latitude => position, :longitude => position) - get feed_notes_path(:format => "rss") + get feed_api_notes_path(:format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do @@ -1027,28 +1186,41 @@ module Api end end - get feed_notes_path(:bbox => "1,1,1.2,1.2", :format => "rss") + get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :format => "rss") assert_response :success assert_equal "application/rss+xml", @response.media_type assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do + assert_select "description", :text => /1\.2/, :count => 1 assert_select "item", :count => 2 end end + + get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit, :format => "rss") + assert_response :success end def test_feed_fail - get feed_notes_path(:bbox => "1,1,1.2", :format => "rss") + get feed_api_notes_path(:bbox => "1,1,1.2", :format => "rss") assert_response :bad_request - get feed_notes_path(:bbox => "1,1,1.2,1.2,1.2", :format => "rss") + get feed_api_notes_path(:bbox => "1,1,1.2,1.2,1.2", :format => "rss") assert_response :bad_request - get feed_notes_path(:bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss") + get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => "0", :format => "rss") assert_response :bad_request - get feed_notes_path(:bbox => "1,1,1.2,1.2", :limit => "10001", :format => "rss") + get feed_api_notes_path(:bbox => "1,1,1.2,1.2", :limit => Settings.max_note_query_limit + 1, :format => "rss") assert_response :bad_request end + + private + + def assert_notes_in_order(notes) + assert_select "osm>note", notes.size + notes.each_with_index do |note, index| + assert_select "osm>note:nth-child(#{index + 1})>id", :text => note.id.to_s, :count => 1 + end + end end end