X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34a94fa358cd61140833a289f33f88b432ff1013..bda941f49dbe507df186b918d815def53ed604d6:/test/functional/notes_controller_test.rb?ds=sidebyside diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb index e5fa9e33f..a4720eb06 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/functional/notes_controller_test.rb @@ -38,6 +38,10 @@ class NotesControllerTest < ActionController::TestCase { :path => "/api/0.6/notes/1/close", :method => :post }, { :controller => "notes", :action => "close", :id => "1", :format => "xml" } ) + assert_routing( + { :path => "/api/0.6/notes/1/reopen", :method => :post }, + { :controller => "notes", :action => "reopen", :id => "1", :format => "xml" } + ) assert_routing( { :path => "/api/0.6/notes/1", :method => :delete }, { :controller => "notes", :action => "destroy", :id => "1", :format => "xml" } @@ -193,6 +197,20 @@ class NotesControllerTest < ActionController::TestCase end end assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {: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 :create, {:lat => -1.0, :lon => 'abc', :text => "This is a comment"} + end + end + assert_response :bad_request end def test_comment_success @@ -305,22 +323,116 @@ class NotesControllerTest < ActionController::TestCase assert_response :conflict end + def test_reopen_success + post :reopen, {:id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :reopen, {:id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 2, 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 "test2", js["properties"]["comments"].last["user"] + + get :show, {:id => notes(:closed_note_with_comment).id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 2, 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 "test2", js["properties"]["comments"].last["user"] + end + + def test_reopen_fail + post :reopen, {:id => notes(:hidden_note_with_comment).id} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :reopen, {:id => 12345} + assert_response :not_found + + post :reopen, {:id => notes(:hidden_note_with_comment).id} + assert_response :gone + + post :reopen, {:id => notes(:open_note_with_comment).id} + assert_response :conflict + end + def test_show_success get :show, {:id => notes(:open_note).id, :format => "xml"} assert_response :success assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note[lat=#{notes(:open_note).lat}][lon=#{notes(:open_note).lon}]", :count => 1 do + assert_select "id", notes(:open_note).id + assert_select "url", note_url(notes(:open_note), :format => "xml") + assert_select "comment_url", comment_note_url(notes(:open_note), :format => "xml") + assert_select "close_url", close_note_url(notes(:open_note), :format => "xml") + assert_select "date_created", notes(:open_note).created_at.to_s + assert_select "status", notes(:open_note).status + assert_select "comments", :count => 1 do + assert_select "comment", :count => 1 + end + end + end get :show, {:id => notes(:open_note).id, :format => "rss"} assert_response :success assert_equal "application/rss+xml", @response.content_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(notes(:open_note)) + assert_select "guid", note_url(notes(:open_note)) + assert_select "pubDate", notes(:open_note).created_at.to_s(:rfc822) +# assert_select "geo:lat", notes(:open_note).lat.to_s +# assert_select "geo:long", notes(:open_note).lon +# assert_select "georss:point", "#{notes(:open_note).lon} #{notes(:open_note).lon}" + end + end + end get :show, {:id => notes(:open_note).id, :format => "json"} assert_response :success assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal "Point", js["geometry"]["type"] + assert_equal notes(:open_note).lat, js["geometry"]["coordinates"][0] + assert_equal notes(:open_note).lon, js["geometry"]["coordinates"][1] + assert_equal notes(:open_note).id, js["properties"]["id"] + assert_equal note_url(notes(:open_note), :format => "json"), js["properties"]["url"] + assert_equal comment_note_url(notes(:open_note), :format => "json"), js["properties"]["comment_url"] + assert_equal close_note_url(notes(:open_note), :format => "json"), js["properties"]["close_url"] + assert_equal notes(:open_note).created_at, js["properties"]["date_created"] + assert_equal notes(:open_note).status, js["properties"]["status"] get :show, {:id => notes(:open_note).id, :format => "gpx"} assert_response :success assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt[lat=#{notes(:open_note).lat}][lon=#{notes(:open_note).lon}]", :count => 1 do + assert_select "extension", :count => 1 do + assert_select "id", notes(:open_note).id + assert_select "url", note_url(notes(:open_note), :format => "gpx") + assert_select "comment_url", comment_note_url(notes(:open_note), :format => "gpx") + assert_select "close_url", close_note_url(notes(:open_note), :format => "gpx") + end + end + end end def test_show_hidden_comment @@ -328,6 +440,7 @@ class NotesControllerTest < ActionController::TestCase assert_response :success js = ActiveSupport::JSON.decode(@response.body) assert_not_nil js + assert_equal "Feature", js["type"] assert_equal notes(:note_with_hidden_comment).id, js["properties"]["id"] assert_equal 2, js["properties"]["comments"].count assert_equal "Valid comment for note 5", js["properties"]["comments"][0]["text"] @@ -592,10 +705,20 @@ class NotesControllerTest < ActionController::TestCase get :feed, {:format => "rss"} assert_response :success assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 8 + end + end get :feed, {:bbox => "1,1,1.2,1.2", :format => "rss"} assert_response :success assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 3 + end + end end def test_feed_fail