diff options
author | José Valim <jose.valim@gmail.com> | 2012-01-02 11:54:00 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-01-02 11:54:00 -0800 |
commit | 44df252382cc2301364495ff65563d23bcc1b070 (patch) | |
tree | f3dcb38780d337fafde11f4e758f27c54136059b /actionpack/test/controller | |
parent | deaa68281c3737e03227aa127646c04acaa21eb6 (diff) | |
parent | 0f2f8003d2351079ce6ec0e706e474d8024839cc (diff) | |
download | rails-44df252382cc2301364495ff65563d23bcc1b070.tar.gz rails-44df252382cc2301364495ff65563d23bcc1b070.tar.bz2 rails-44df252382cc2301364495ff65563d23bcc1b070.zip |
Merge pull request #4252 from lest/deprecate-activesupport-base64
remove ActiveSupport::Base64 in favor of ::Base64
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/http_basic_authentication_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/http_basic_authentication_test.rb b/actionpack/test/controller/http_basic_authentication_test.rb index 364e96d4f6..7286b249c7 100644 --- a/actionpack/test/controller/http_basic_authentication_test.rb +++ b/actionpack/test/controller/http_basic_authentication_test.rb @@ -132,6 +132,6 @@ class HttpBasicAuthenticationTest < ActionController::TestCase private def encode_credentials(username, password) - "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}" + "Basic #{::Base64.encode64("#{username}:#{password}")}" end end |