Merge remote-tracking branch 'upstream/pull/5069'

[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 e25926c78e41dfcf5bb691f268101256a83c3ce3..f479b24b3cb99b3b9f68921fd772086f69bd4103 100644 (file)
--- a/test/controllers/api/changeset_comments_controller_test.rb
+++ b/test/controllers/api/changeset_comments_controller_test.rb
@@ -46,7 +46,7 @@ module Api
       assert_difference "ChangesetComment.count", 1 do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do
-            post changeset_comment_path(:id => private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header
+            post changeset_comment_path(private_user_closed_changeset, :text => "This is a comment"), :headers => auth_header
           end
         end
       end
@@ -61,7 +61,7 @@ module Api
       assert_difference "ChangesetComment.count", 1 do
         assert_difference "ActionMailer::Base.deliveries.size", 1 do
           perform_enqueued_jobs do
-            post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header
+            post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header
           end
         end
       end
@@ -79,7 +79,7 @@ module Api
       assert_difference "ChangesetComment.count", 1 do
         assert_difference "ActionMailer::Base.deliveries.size", 2 do
           perform_enqueued_jobs do
-            post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header
+            post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header
           end
         end
       end
@@ -102,32 +102,32 @@ module Api
     # create comment fail
     def test_create_comment_fail
       # unauthorized
-      post changeset_comment_path(:id => create(:changeset, :closed), :text => "This is a comment")
+      post changeset_comment_path(create(:changeset, :closed), :text => "This is a comment")
       assert_response :unauthorized
 
       auth_header = basic_authorization_header create(:user).email, "test"
 
       # bad changeset id
       assert_no_difference "ChangesetComment.count" do
-        post changeset_comment_path(:id => 999111, :text => "This is a comment"), :headers => auth_header
+        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 changeset_comment_path(:id => create(:changeset), :text => "This is a comment"), :headers => auth_header
+        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 changeset_comment_path(:id => create(:changeset, :closed)), :headers => auth_header
+        post changeset_comment_path(create(:changeset, :closed)), :headers => auth_header
       end
       assert_response :bad_request
 
       # empty text
       assert_no_difference "ChangesetComment.count" do
-        post changeset_comment_path(:id => create(:changeset, :closed), :text => ""), :headers => auth_header
+        post changeset_comment_path(create(:changeset, :closed), :text => ""), :headers => auth_header
       end
       assert_response :bad_request
     end
@@ -142,13 +142,13 @@ module Api
 
       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(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
+          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(:id => changeset, :text => "One comment too many"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header
         assert_response :too_many_requests
       end
     end
@@ -164,13 +164,13 @@ module Api
 
       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(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
+          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(:id => changeset, :text => "One comment too many"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header
         assert_response :too_many_requests
       end
     end
@@ -186,13 +186,13 @@ module Api
 
       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(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
+          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(:id => changeset, :text => "One comment too many"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header
         assert_response :too_many_requests
       end
     end
@@ -207,13 +207,13 @@ module Api
 
       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(:id => changeset, :text => "Comment #{count}"), :headers => auth_header
+          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(:id => changeset, :text => "One comment too many"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "One comment too many"), :headers => auth_header
         assert_response :too_many_requests
       end
     end
@@ -225,21 +225,21 @@ module Api
       comment = create(:changeset_comment)
       assert comment.visible
 
-      post changeset_comment_hide_path(:id => comment)
+      post changeset_comment_hide_path(comment)
       assert_response :unauthorized
       assert comment.reload.visible
 
       auth_header = basic_authorization_header create(:user).email, "test"
 
       # not a moderator
-      post changeset_comment_hide_path(:id => comment), :headers => auth_header
+      post changeset_comment_hide_path(comment), :headers => auth_header
       assert_response :forbidden
       assert comment.reload.visible
 
       auth_header = basic_authorization_header create(:moderator_user).email, "test"
 
       # bad comment id
-      post changeset_comment_hide_path(:id => 999111), :headers => auth_header
+      post changeset_comment_hide_path(999111), :headers => auth_header
       assert_response :not_found
       assert comment.reload.visible
     end
@@ -252,7 +252,7 @@ module Api
 
       auth_header = basic_authorization_header create(:moderator_user).email, "test"
 
-      post changeset_comment_hide_path(:id => comment), :headers => auth_header
+      post changeset_comment_hide_path(comment), :headers => auth_header
       assert_response :success
       assert_not comment.reload.visible
     end
@@ -264,21 +264,21 @@ module Api
       comment = create(:changeset_comment, :visible => false)
       assert_not comment.visible
 
-      post changeset_comment_unhide_path(:id => comment)
+      post changeset_comment_unhide_path(comment)
       assert_response :unauthorized
       assert_not comment.reload.visible
 
       auth_header = basic_authorization_header create(:user).email, "test"
 
       # not a moderator
-      post changeset_comment_unhide_path(:id => comment), :headers => auth_header
+      post changeset_comment_unhide_path(comment), :headers => auth_header
       assert_response :forbidden
       assert_not comment.reload.visible
 
       auth_header = basic_authorization_header create(:moderator_user).email, "test"
 
       # bad comment id
-      post changeset_comment_unhide_path(:id => 999111), :headers => auth_header
+      post changeset_comment_unhide_path(999111), :headers => auth_header
       assert_response :not_found
       assert_not comment.reload.visible
     end
@@ -291,7 +291,7 @@ module Api
 
       auth_header = basic_authorization_header create(:moderator_user).email, "test"
 
-      post changeset_comment_unhide_path(:id => comment), :headers => auth_header
+      post changeset_comment_unhide_path(comment), :headers => auth_header
       assert_response :success
       assert comment.reload.visible
     end
@@ -303,11 +303,11 @@ 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)
+      token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[write_api])
       changeset = create(:changeset, :closed)
 
       assert_difference "ChangesetComment.count", 0 do
-        signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token }
+        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token)
       end
       assert_response :forbidden
 
@@ -316,7 +316,7 @@ module Api
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do
-        signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token }
+        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(token.token)
       end
       assert_response :success
     end
@@ -330,7 +330,7 @@ module Api
       auth_header = basic_authorization_header user.email, "test"
 
       assert_difference "ChangesetComment.count", 0 do
-        post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header
       end
       assert_response :forbidden
 
@@ -339,7 +339,7 @@ module Api
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do
-        post changeset_comment_path(:id => changeset, :text => "This is a comment"), :headers => auth_header
+        post changeset_comment_path(changeset, :text => "This is a comment"), :headers => auth_header
       end
       assert_response :success
     end