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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index c45c7346541aa420dd760e7d86627a2b5e442d55..79d5d0d33664e53769d575684ae9dc86e7445c3c 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -133,15 +133,16 @@ module ActiveSupport
       assert_equal a.tags, b.tags, "tags on node #{a.id}"
     end
 
       assert_equal a.tags, b.tags, "tags on node #{a.id}"
     end
 

-    ##
-    # return request header for HTTP Basic Authorization
-    def basic_authorization_header(user, pass)
-      { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }
-    end
-

     ##
     # return request header for HTTP Bearer Authorization
     ##
     # return request header for HTTP Bearer Authorization

-    def bearer_authorization_header(token)
+    def bearer_authorization_header(token_or_user = nil, scopes: Oauth::SCOPES)
+      token = case token_or_user
+              when nil then create(:oauth_access_token, :scopes => scopes).token
+              when User then create(:oauth_access_token, :resource_owner_id => token_or_user.id, :scopes => scopes).token
+              when Doorkeeper::AccessToken then token_or_user.token
+              when String then token_or_user
+              end
+

       { "Authorization" => "Bearer #{token}" }
     end
 
       { "Authorization" => "Bearer #{token}" }
     end
 


@@ -168,7 +169,7 @@ module ActiveSupport
     ##
     # Not sure this is the best response we could give
     def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
     ##
     # Not sure this is the best response we could give
     def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")

-      assert_response :unauthorized, msg
+      assert_response :forbidden, msg

       # assert_equal @response.headers['Error'], ""
     end
 
       # assert_equal @response.headers['Error'], ""
     end
 


@@ -339,10 +340,10 @@ module ActiveSupport
       Settings.merge!(saved_settings)
     end
 
       Settings.merge!(saved_settings)
     end
 

-    def with_user_account_deletion_delay(value, &block)
+    def with_user_account_deletion_delay(value, &)

       freeze_time
 
       freeze_time
 

-      with_settings(:user_account_deletion_delay => value, &block)
+      with_settings(:user_account_deletion_delay => value, &)

     ensure
       unfreeze_time
     end
     ensure
       unfreeze_time
     end