Merge pull request #4197 from AntonKhorev/user-resources

[rails.git] / 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 24228c28c966134f589ede377ada83b2e3ed2a98..624b8a35808645c1964c3b7fd40aa5fa5f46b262 100644 (file)
--- 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
 require "test_helper"
 
 module Api

-  class ChangesetCommentsControllerTest < ActionController::TestCase
+  class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest

     ##
     # test all routes which lead to this controller
     def test_routes
     ##
     # 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" }
       )
         { :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", :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", :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
 
     ##
     end
 
     ##


@@ -29,12 +41,12 @@ module Api
       deleted_user = create(:user, :deleted)
       private_user_closed_changeset = create(:changeset, :closed, :user => private_user)
 
       deleted_user = create(:user, :deleted)
       private_user_closed_changeset = create(:changeset, :closed, :user => private_user)
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
       assert_difference "ChangesetComment.count", 1 do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do
 
       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(:id => private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header

           end
         end
       end
           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
       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(:id => changeset, :text => "This is a comment"), :headers => auth_header

           end
         end
       end
           end
         end
       end


@@ -62,12 +74,12 @@ module Api
 
       ActionMailer::Base.deliveries.clear
 
 
       ActionMailer::Base.deliveries.clear
 

-      basic_authorization user2.email, "test"
+      auth_header = basic_authorization_header user2.email, "test"

 
       assert_difference "ChangesetComment.count", 1 do
         assert_difference "ActionMailer::Base.deliveries.size", 2 do
           perform_enqueued_jobs do
 
       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(:id => changeset, :text => "This is a comment"), :headers => auth_header

           end
         end
       end
           end
         end
       end


@@ -90,73 +102,94 @@ module Api
     # create comment fail
     def test_create_comment_fail
       # unauthorized
     # 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(:id => create(:changeset, :closed), :text => "This is a comment")

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # bad changeset id
       assert_no_difference "ChangesetComment.count" do
 
       # bad changeset id
       assert_no_difference "ChangesetComment.count" do

-        post :create, :params => { :id => 999111, :text => "This is a comment" }
+        post changeset_comment_path(:id => 999111, :text => "This is a comment"), :headers => auth_header

       end
       assert_response :not_found
 
       # not closed changeset
       assert_no_difference "ChangesetComment.count" do
       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(:id => create(:changeset), :text => "This is a comment"), :headers => auth_header

       end
       assert_response :conflict
 
       # no text
       assert_no_difference "ChangesetComment.count" do
       end
       assert_response :conflict
 
       # no text
       assert_no_difference "ChangesetComment.count" do

-        post :create, :params => { :id => create(:changeset, :closed).id }
+        post changeset_comment_path(:id => create(:changeset, :closed)), :headers => auth_header

       end
       assert_response :bad_request
 
       # empty text
       assert_no_difference "ChangesetComment.count" do
       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(:id => create(:changeset, :closed), :text => ""), :headers => auth_header

       end
       assert_response :bad_request
     end
 
       end
       assert_response :bad_request
     end
 

+    ##
+    # create comment rate limit
+    def test_create_comment_rate_limit
+      changeset = create(:changeset, :closed)
+      user = create(:user)
+
+      auth_header = basic_authorization_header user.email, "test"
+
+      assert_difference "ChangesetComment.count", Settings.min_changeset_comments_per_hour do
+        1.upto(Settings.min_changeset_comments_per_hour) do |count|
+          post changeset_comment_path(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
+          assert_response :success
+        end
+      end
+
+      assert_no_difference "ChangesetComment.count" do
+        post changeset_comment_path(:id => 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
       # unauthorized
       comment = create(:changeset_comment)
     ##
     # test hide comment fail
     def test_destroy_comment_fail
       # unauthorized
       comment = create(:changeset_comment)

-      assert_equal true, comment.visible
+      assert comment.visible

 
 

-      post :destroy, :params => { :id => comment.id }
+      post changeset_comment_hide_path(:id => comment)

       assert_response :unauthorized
       assert_response :unauthorized

-      assert_equal true, comment.reload.visible
+      assert comment.reload.visible

 
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # not a moderator
 
       # not a moderator

-      post :destroy, :params => { :id => comment.id }
+      post changeset_comment_hide_path(:id => comment), :headers => auth_header

       assert_response :forbidden
       assert_response :forbidden

-      assert_equal true, comment.reload.visible
+      assert comment.reload.visible

 
 

-      basic_authorization create(:moderator_user).email, "test"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
       # bad comment id
 
       # bad comment id

-      post :destroy, :params => { :id => 999111 }
+      post changeset_comment_hide_path(:id => 999111), :headers => auth_header

       assert_response :not_found
       assert_response :not_found

-      assert_equal true, comment.reload.visible
+      assert comment.reload.visible

     end
 
     ##
     # test hide comment succes
     def test_hide_comment_success
       comment = create(:changeset_comment)
     end
 
     ##
     # test hide comment succes
     def test_hide_comment_success
       comment = create(:changeset_comment)

-      assert_equal true, comment.visible
+      assert comment.visible

 
 

-      basic_authorization create(:moderator_user).email, "test"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
 

-      post :destroy, :params => { :id => comment.id }
+      post changeset_comment_hide_path(:id => comment), :headers => auth_header

       assert_response :success
       assert_response :success

-      assert_equal false, comment.reload.visible
+      assert_not comment.reload.visible

     end
 
     ##
     end
 
     ##


@@ -164,38 +197,38 @@ module Api
     def test_restore_comment_fail
       # unauthorized
       comment = create(:changeset_comment, :visible => false)
     def test_restore_comment_fail
       # unauthorized
       comment = create(:changeset_comment, :visible => false)

-      assert_equal false, comment.visible
+      assert_not comment.visible

 
 

-      post :restore, :params => { :id => comment.id }
+      post changeset_comment_unhide_path(:id => comment)

       assert_response :unauthorized
       assert_response :unauthorized

-      assert_equal false, comment.reload.visible
+      assert_not comment.reload.visible

 
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # not a moderator
 
       # not a moderator

-      post :restore, :params => { :id => comment.id }
+      post changeset_comment_unhide_path(:id => comment), :headers => auth_header

       assert_response :forbidden
       assert_response :forbidden

-      assert_equal false, comment.reload.visible
+      assert_not comment.reload.visible

 
 

-      basic_authorization create(:moderator_user).email, "test"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
       # bad comment id
 
       # bad comment id

-      post :restore, :params => { :id => 999111 }
+      post changeset_comment_unhide_path(:id => 999111), :headers => auth_header

       assert_response :not_found
       assert_response :not_found

-      assert_equal false, comment.reload.visible
+      assert_not comment.reload.visible

     end
 
     ##
     # test unhide comment succes
     def test_unhide_comment_success
       comment = create(:changeset_comment, :visible => false)
     end
 
     ##
     # test unhide comment succes
     def test_unhide_comment_success
       comment = create(:changeset_comment, :visible => false)

-      assert_equal false, comment.visible
+      assert_not comment.visible

 
 

-      basic_authorization create(:moderator_user).email, "test"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
 

-      post :restore, :params => { :id => comment.id }
+      post changeset_comment_unhide_path(:id => comment), :headers => auth_header

       assert_response :success
       assert_response :success

-      assert_equal true, comment.reload.visible
+      assert comment.reload.visible

     end
 
     # This test ensures that token capabilities behave correctly for a method that
     end
 
     # This test ensures that token capabilities behave correctly for a method that


@@ -208,22 +241,17 @@ module Api
       token = create(:access_token, :user => user, :allow_write_api => true)
       changeset = create(:changeset, :closed)
 
       token = create(:access_token, :user => user, :allow_write_api => true)
       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
       assert_difference "ChangesetComment.count", 0 do

-        post :create, :params => { :id => changeset.id, :text => "This is a comment" }
+        signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token }

       end
       assert_response :forbidden
 
       # Try again, after agreement with the terms
       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
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do

-        post :create, :params => { :id => changeset.id, :text => "This is a comment" }
+        signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token }

       end
       assert_response :success
     end
       end
       assert_response :success
     end


@@ -234,19 +262,19 @@ module Api
       user = create(:user, :terms_agreed => nil)
       changeset = create(:changeset, :closed)
 
       user = create(:user, :terms_agreed => nil)
       changeset = create(:changeset, :closed)
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
       assert_difference "ChangesetComment.count", 0 do
 
       assert_difference "ChangesetComment.count", 0 do

-        post :create, :params => { :id => changeset.id, :text => "This is a comment" }
+        post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header

       end
       assert_response :forbidden
 
       # Try again, after agreement with the terms
       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
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do

-        post :create, :params => { :id => changeset.id, :text => "This is a comment" }
+        post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header

       end
       assert_response :success
     end
       end
       assert_response :success
     end