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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 70f69a3ae94a590140eebd1a97fa15f46437775c..c9ec46dcf41cf1b78c9cab334b8027dde167aa0e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -82,7 +82,7 @@ module ActiveSupport
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)

-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
+      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))

     end
 
     ##
     end
 
     ##