X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/23e00dc4c79a5c42f3a9598e112004ec70de1de3..9929c1b585bd0e0b088cc785af06720d46f2dcce:/test/controllers/api/notes_controller_test.rb diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb index 045e3bf43..c0c67fc91 100644 --- a/test/controllers/api/notes_controller_test.rb +++ b/test/controllers/api/notes_controller_test.rb @@ -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 api_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 @@ -156,7 +137,7 @@ 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 api_notes_path(:lon => -1.0, :text => "This is a comment") @@ -221,14 +202,55 @@ module Api 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_create_no_scope_fail + user = create(:user) + auth_header = bearer_authorization_header user, :scopes => %w[read_prefs] + + assert_no_difference "Note.count" do + post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a description", :format => "json"), :headers => auth_header + + assert_response :forbidden + end + 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_api_note_path(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,6 +265,10 @@ module Api assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] + 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) @@ -254,7 +280,9 @@ 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) @@ -265,12 +293,14 @@ module Api create(:note_comment, :note => note, :author => second_user) end - 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_api_note_path(note_with_comments_by_users, :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(note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header + end end end end @@ -285,6 +315,62 @@ 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 + + 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"] + end + + def test_comment_with_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 + 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 = bearer_authorization_header third_user + + assert_difference "NoteComment.count", 1 do + 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 + 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 + email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email } assert_not_nil email assert_equal 1, email.to.length @@ -307,8 +393,43 @@ module Api 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"] + 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 - ActionMailer::Base.deliveries.clear + 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 @@ -321,7 +442,7 @@ module Api 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_api_note_path(open_note_with_comment), :headers => auth_header @@ -365,9 +486,11 @@ module Api 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_api_note_path(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,6 +502,10 @@ module Api assert_equal "This is a close comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] + 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) @@ -396,7 +523,7 @@ module Api 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_api_note_path(12345), :headers => auth_header assert_response :not_found @@ -419,9 +546,11 @@ module Api 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_api_note_path(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 @@ -433,6 +562,10 @@ module Api assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"] assert_equal user.display_name, js["properties"]["comments"].last["user"] + 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) @@ -452,7 +585,7 @@ module Api 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_api_note_path(12345), :headers => auth_header assert_response :not_found @@ -571,12 +704,12 @@ module Api 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 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 api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header assert_response :success @@ -593,7 +726,7 @@ module Api 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 api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header assert_response :gone @@ -606,12 +739,12 @@ module Api 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 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 api_note_path(12345, :format => "json"), :headers => auth_header assert_response :not_found @@ -929,6 +1062,37 @@ module Api assert_select "gpx", :count => 1 do assert_select "wpt", :count => 1 end + + user2 = create(:user) + get search_api_notes_path(:user => user2.id, :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 0 + end + end + + def test_search_by_time_success + note1 = create(:note, :created_at => "2020-02-01T00:00:00Z", :updated_at => "2020-04-01T00:00:00Z") + note2 = create(:note, :created_at => "2020-03-01T00:00:00Z", :updated_at => "2020-05-01T00:00:00Z") + + get search_api_notes_path(:from => "2020-02-15T00:00:00Z", :to => "2020-04-15T00:00:00Z", :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 1 do + assert_select "id", note2.id.to_s + end + end + + get search_api_notes_path(:from => "2020-02-15T00:00:00Z", :to => "2020-04-15T00:00:00Z", :sort => "updated_at", :format => "xml") + assert_response :success + assert_equal "application/xml", @response.media_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 1 do + assert_select "id", note1.id.to_s + end + end end def test_search_by_bbox_success