Fix new rubocop warnings

[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..35e45e8c840f4eb2a17d71b6bb01928d3888447b 100644 (file)
--- a/test/controllers/api/changeset_comments_controller_test.rb
+++ b/test/controllers/api/changeset_comments_controller_test.rb
@@ -41,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)
 

-      auth_header = basic_authorization_header 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
 
       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
           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
       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
           end
         end
       end


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

-      auth_header = basic_authorization_header 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
 
       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
           end
         end
       end


@@ -102,32 +102,32 @@ module Api
     # create comment fail
     def test_create_comment_fail
       # unauthorized
     # 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
 
       assert_response :unauthorized
 

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

 
       # bad changeset id
       assert_no_difference "ChangesetComment.count" do
 
       # 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
       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
       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
       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
       end
       assert_response :bad_request
     end


@@ -138,17 +138,17 @@ module Api
       changeset = create(:changeset, :closed)
       user = create(:user)
 
       changeset = create(:changeset, :closed)
       user = create(:user)
 

-      auth_header = basic_authorization_header user.email, "test"
+      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|
 
       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
           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
         assert_response :too_many_requests
       end
     end


@@ -160,17 +160,17 @@ module Api
       user = create(:user)
       create_list(:changeset_comment, 200, :author_id => user.id, :created_at => Time.now.utc - 1.day)
 
       user = create(:user)
       create_list(:changeset_comment, 200, :author_id => user.id, :created_at => Time.now.utc - 1.day)
 

-      auth_header = basic_authorization_header user.email, "test"
+      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|
 
       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
           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
         assert_response :too_many_requests
       end
     end


@@ -182,17 +182,17 @@ module Api
       user = create(:user)
       create(:issue_with_reports, :reportable => user, :reported_user => user)
 
       user = create(:user)
       create(:issue_with_reports, :reportable => user, :reported_user => user)
 

-      auth_header = basic_authorization_header user.email, "test"
+      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|
 
       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
           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
         assert_response :too_many_requests
       end
     end


@@ -203,17 +203,17 @@ module Api
       changeset = create(:changeset, :closed)
       user = create(:moderator_user)
 
       changeset = create(:changeset, :closed)
       user = create(:moderator_user)
 

-      auth_header = basic_authorization_header user.email, "test"
+      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|
 
       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
           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
         assert_response :too_many_requests
       end
     end


@@ -225,21 +225,21 @@ module Api
       comment = create(:changeset_comment)
       assert comment.visible
 
       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
 
       assert_response :unauthorized
       assert comment.reload.visible
 

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

 
       # not a moderator
 
       # 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
 
       assert_response :forbidden
       assert comment.reload.visible
 

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

 
       # bad comment id
 
       # 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
       assert_response :not_found
       assert comment.reload.visible
     end


@@ -250,9 +250,9 @@ module Api
       comment = create(:changeset_comment)
       assert comment.visible
 
       comment = create(:changeset_comment)
       assert comment.visible
 

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

 
 

-      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
       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
 
       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
 
       assert_response :unauthorized
       assert_not comment.reload.visible
 

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

 
       # not a moderator
 
       # 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
 
       assert_response :forbidden
       assert_not comment.reload.visible
 

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

 
       # bad comment id
 
       # 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
       assert_response :not_found
       assert_not comment.reload.visible
     end


@@ -289,9 +289,9 @@ module Api
       comment = create(:changeset_comment, :visible => false)
       assert_not comment.visible
 
       comment = create(:changeset_comment, :visible => false)
       assert_not comment.visible
 

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

 
 

-      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
       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)
     # 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)
 
       assert_difference "ChangesetComment.count", 0 do
       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 => auth_header

       end
       assert_response :forbidden
 
       end
       assert_response :forbidden
 


@@ -316,30 +316,7 @@ module Api
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do

-        signed_post changeset_comment_path(:id => changeset), :params => { :text => "This is a comment" }, :oauth => { :token => token }
-      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)
-
-      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
-      end
-      assert_response :forbidden
-
-      # Try again, after agreement with the terms
-      user.terms_agreed = Time.now.utc
-      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), :params => { :text => "This is a comment" }, :headers => auth_header

       end
       assert_response :success
     end
       end
       assert_response :success
     end