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

[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 ca7fc3407966067c7cc225f0acf9f27caaa4e741..21f30714c2213034fef4e4d4041ce2e05273ef68 100644 (file)
--- a/test/controllers/api/changeset_comments_controller_test.rb
+++ b/test/controllers/api/changeset_comments_controller_test.rb
@@ -158,7 +158,7 @@ module Api
     def test_create_comment_experienced_user_rate_limit
       changeset = create(:changeset, :closed)
       user = create(:user)
     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)
+      create_list(:changeset_comment, Settings.comments_to_max_changeset_comments, :author_id => user.id, :created_at => Time.now.utc - 1.day)

 
       auth_header = bearer_authorization_header user
 
 
       auth_header = bearer_authorization_header user
 


@@ -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(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[write_api])
+      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

-        post changeset_comment_path(changeset), :params => { :text => "This is a comment" }, :headers => bearer_authorization_header(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,7 +316,7 @@ module Api
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do
       user.save!
 
       assert_difference "ChangesetComment.count", 1 do

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

       end
       assert_response :success
     end
       end
       assert_response :success
     end