X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c51786d10bc6dda488964f468a6a3071dd6912a8..e15a92a30213d87e10e000a240a7dcab66c208b4:/test/controllers/api/changeset_comments_controller_test.rb diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb index ba2068d84..35e45e8c8 100644 --- a/test/controllers/api/changeset_comments_controller_test.rb +++ b/test/controllers/api/changeset_comments_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" module Api - class ChangesetCommentsControllerTest < ActionController::TestCase + class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes @@ -9,14 +9,26 @@ module Api { :path => "/api/0.6/changeset/1/comment", :method => :post }, { :controller => "api/changeset_comments", :action => "create", :id => "1" } ) + assert_routing( + { :path => "/api/0.6/changeset/1/comment.json", :method => :post }, + { :controller => "api/changeset_comments", :action => "create", :id => "1", :format => "json" } + ) assert_routing( { :path => "/api/0.6/changeset/comment/1/hide", :method => :post }, { :controller => "api/changeset_comments", :action => "destroy", :id => "1" } ) + assert_routing( + { :path => "/api/0.6/changeset/comment/1/hide.json", :method => :post }, + { :controller => "api/changeset_comments", :action => "destroy", :id => "1", :format => "json" } + ) assert_routing( { :path => "/api/0.6/changeset/comment/1/unhide", :method => :post }, { :controller => "api/changeset_comments", :action => "restore", :id => "1" } ) + assert_routing( + { :path => "/api/0.6/changeset/comment/1/unhide.json", :method => :post }, + { :controller => "api/changeset_comments", :action => "restore", :id => "1", :format => "json" } + ) end ## @@ -29,12 +41,12 @@ module Api deleted_user = create(:user, :deleted) private_user_closed_changeset = create(:changeset, :closed, :user => private_user) - basic_authorization user.email, "test" + auth_header = bearer_authorization_header user assert_difference "ChangesetComment.count", 1 do assert_no_difference "ActionMailer::Base.deliveries.size" do perform_enqueued_jobs do - post :create, :params => { :id => private_user_closed_changeset.id, :text => "This is a comment" } + post changeset_comment_path(private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -49,7 +61,7 @@ module Api assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do perform_enqueued_jobs do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -62,12 +74,12 @@ module Api ActionMailer::Base.deliveries.clear - basic_authorization user2.email, "test" + auth_header = bearer_authorization_header user2 assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 2 do perform_enqueued_jobs do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } + post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header end end end @@ -90,36 +102,122 @@ module Api # create comment fail def test_create_comment_fail # unauthorized - post :create, :params => { :id => create(:changeset, :closed).id, :text => "This is a comment" } + post changeset_comment_path(create(:changeset, :closed), :text => "This is a comment") assert_response :unauthorized - basic_authorization create(:user).email, "test" + auth_header = bearer_authorization_header # bad changeset id assert_no_difference "ChangesetComment.count" do - post :create, :params => { :id => 999111, :text => "This is a comment" } + post changeset_comment_path(999111, :text => "This is a comment"), :headers => auth_header end assert_response :not_found # not closed changeset assert_no_difference "ChangesetComment.count" do - post :create, :params => { :id => create(:changeset).id, :text => "This is a comment" } + post changeset_comment_path(create(:changeset), :text => "This is a comment"), :headers => auth_header end assert_response :conflict # no text assert_no_difference "ChangesetComment.count" do - post :create, :params => { :id => create(:changeset, :closed).id } + post changeset_comment_path(create(:changeset, :closed)), :headers => auth_header end assert_response :bad_request # empty text assert_no_difference "ChangesetComment.count" do - post :create, :params => { :id => create(:changeset, :closed).id, :text => "" } + post changeset_comment_path(create(:changeset, :closed), :text => ""), :headers => auth_header end assert_response :bad_request end + ## + # create comment rate limit for new users + def test_create_comment_new_user_rate_limit + changeset = create(:changeset, :closed) + user = create(:user) + + auth_header = bearer_authorization_header user + + assert_difference "ChangesetComment.count", Settings.initial_changeset_comments_per_hour do + 1.upto(Settings.initial_changeset_comments_per_hour) do |count| + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header + assert_response :success + end + end + + assert_no_difference "ChangesetComment.count" do + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header + assert_response :too_many_requests + end + end + + ## + # create comment rate limit for experienced users + def test_create_comment_experienced_user_rate_limit + changeset = create(:changeset, :closed) + user = create(:user) + create_list(:changeset_comment, 200, :author_id => user.id, :created_at => Time.now.utc - 1.day) + + auth_header = bearer_authorization_header user + + assert_difference "ChangesetComment.count", Settings.max_changeset_comments_per_hour do + 1.upto(Settings.max_changeset_comments_per_hour) do |count| + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header + assert_response :success + end + end + + assert_no_difference "ChangesetComment.count" do + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header + assert_response :too_many_requests + end + end + + ## + # create comment rate limit for reported users + def test_create_comment_reported_user_rate_limit + changeset = create(:changeset, :closed) + user = create(:user) + create(:issue_with_reports, :reportable => user, :reported_user => user) + + auth_header = bearer_authorization_header user + + assert_difference "ChangesetComment.count", Settings.initial_changeset_comments_per_hour / 2 do + 1.upto(Settings.initial_changeset_comments_per_hour / 2) do |count| + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header + assert_response :success + end + end + + assert_no_difference "ChangesetComment.count" do + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header + assert_response :too_many_requests + end + end + + ## + # create comment rate limit for moderator users + def test_create_comment_moderator_user_rate_limit + changeset = create(:changeset, :closed) + user = create(:moderator_user) + + auth_header = bearer_authorization_header user + + assert_difference "ChangesetComment.count", Settings.moderator_changeset_comments_per_hour do + 1.upto(Settings.moderator_changeset_comments_per_hour) do |count| + post changeset_comment_path(changeset, :text => "Comment #{count}"), :headers => auth_header + assert_response :success + end + end + + assert_no_difference "ChangesetComment.count" do + post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header + assert_response :too_many_requests + end + end + ## # test hide comment fail def test_destroy_comment_fail @@ -127,21 +225,21 @@ module Api comment = create(:changeset_comment) assert comment.visible - post :destroy, :params => { :id => comment.id } + post changeset_comment_hide_path(comment) assert_response :unauthorized assert comment.reload.visible - basic_authorization create(:user).email, "test" + auth_header = bearer_authorization_header # not a moderator - post :destroy, :params => { :id => comment.id } + post changeset_comment_hide_path(comment), :headers => auth_header assert_response :forbidden assert comment.reload.visible - basic_authorization create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) # bad comment id - post :destroy, :params => { :id => 999111 } + post changeset_comment_hide_path(999111), :headers => auth_header assert_response :not_found assert comment.reload.visible end @@ -152,9 +250,9 @@ module Api comment = create(:changeset_comment) assert comment.visible - basic_authorization create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) - post :destroy, :params => { :id => comment.id } + post changeset_comment_hide_path(comment), :headers => auth_header assert_response :success assert_not comment.reload.visible end @@ -166,21 +264,21 @@ module Api comment = create(:changeset_comment, :visible => false) assert_not comment.visible - post :restore, :params => { :id => comment.id } + post changeset_comment_unhide_path(comment) assert_response :unauthorized assert_not comment.reload.visible - basic_authorization create(:user).email, "test" + auth_header = bearer_authorization_header # not a moderator - post :restore, :params => { :id => comment.id } + post changeset_comment_unhide_path(comment), :headers => auth_header assert_response :forbidden assert_not comment.reload.visible - basic_authorization create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) # bad comment id - post :restore, :params => { :id => 999111 } + post changeset_comment_unhide_path(999111), :headers => auth_header assert_response :not_found assert_not comment.reload.visible end @@ -191,9 +289,9 @@ module Api comment = create(:changeset_comment, :visible => false) assert_not comment.visible - basic_authorization create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) - post :restore, :params => { :id => comment.id } + post changeset_comment_unhide_path(comment), :headers => auth_header assert_response :success assert comment.reload.visible end @@ -205,48 +303,20 @@ module Api # But writing oauth tests is hard, and so it's easier to put in a controller test.) def test_api_write_and_terms_agreed_via_token user = create(:user, :terms_agreed => nil) - token = create(:access_token, :user => user, :allow_write_api => true) + auth_header = bearer_authorization_header(user, :scopes => %w[write_api]) changeset = create(:changeset, :closed) - # Hack together an oauth request - an alternative would be to sign the request properly - @request.env["oauth.version"] = 1 - @request.env["oauth.strategies"] = [:token] - @request.env["oauth.token"] = token - - assert_difference "ChangesetComment.count", 0 do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } - end - assert_response :forbidden - - # Try again, after agreement with the terms - user.terms_agreed = Time.now - user.save! - - assert_difference "ChangesetComment.count", 1 do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } - end - assert_response :success - end - - # This test does the same as above, but with basic auth, to similarly test that the - # abilities take into account terms agreement too. - def test_api_write_and_terms_agreed_via_basic_auth - user = create(:user, :terms_agreed => nil) - changeset = create(:changeset, :closed) - - basic_authorization user.email, "test" - assert_difference "ChangesetComment.count", 0 do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } + post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header end assert_response :forbidden # Try again, after agreement with the terms - user.terms_agreed = Time.now + user.terms_agreed = Time.now.utc user.save! assert_difference "ChangesetComment.count", 1 do - post :create, :params => { :id => changeset.id, :text => "This is a comment" } + post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => auth_header end assert_response :success end