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

[rails.git] / test / controllers / api / user_preferences_controller_test.rb

diff --git a/test/controllers/api/user_preferences_controller_test.rb b/test/controllers/api/user_preferences_controller_test.rb
index 4e96d4ce9146a8d6227c16280980e659d258987f..41406e1b3d22413b50e07850dadf3ac91f29aacc 100644 (file)
--- a/test/controllers/api/user_preferences_controller_test.rb
+++ b/test/controllers/api/user_preferences_controller_test.rb
@@ -252,10 +252,10 @@ module Api
     # read preferences
     def test_show_using_token
       user = create(:user)
     # read preferences
     def test_show_using_token
       user = create(:user)

-      token = create(:access_token, :user => user, :allow_read_prefs => true)
+      token = create(:oauth_access_token, :resource_owner_id => user.id, :scopes => %w[read_prefs])

       create(:user_preference, :user => user, :k => "key", :v => "value")
 
       create(:user_preference, :user => user, :k => "key", :v => "value")
 

-      signed_get user_preference_path(:preference_key => "key"), :oauth => { :token => token }
+      get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token)

       assert_response :success
     end
 
       assert_response :success
     end
 


@@ -264,10 +264,10 @@ module Api
     # by other methods.
     def test_show_using_token_fail
       user = create(:user)
     # by other methods.
     def test_show_using_token_fail
       user = create(:user)

-      token = create(:access_token, :user => user, :allow_read_prefs => false)
+      token = create(:oauth_access_token, :resource_owner_id => user.id)

       create(:user_preference, :user => user, :k => "key", :v => "value")
 
       create(:user_preference, :user => user, :k => "key", :v => "value")
 

-      signed_get user_preference_path(:preference_key => "key"), :oauth => { :token => token }
+      get user_preference_path(:preference_key => "key"), :headers => bearer_authorization_header(token.token)

       assert_response :forbidden
     end
   end
       assert_response :forbidden
     end
   end