aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-07-20 00:06:57 -0400
committerGitHub <noreply@github.com>2018-07-20 00:06:57 -0400
commit9f152a6066711325a37724f0561a505e134963e9 (patch)
tree4f853c11ea0d6d47d326213ab5a40eee34e93aa2 /actionpack/lib
parent01429a665c1eadd20a64ca25d36190a9d9b555b1 (diff)
parentbd9062971e4b80822bade423c7644bb4eafe492e (diff)
downloadrails-9f152a6066711325a37724f0561a505e134963e9.tar.gz
rails-9f152a6066711325a37724f0561a505e134963e9.tar.bz2
rails-9f152a6066711325a37724f0561a505e134963e9.zip
Merge pull request #33401 from pinewong/patch-1
Fix problem with document expiration in ActionController::HttpAuthentication::Basic
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/http_authentication.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 01676f3237..8d53548e68 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -56,8 +56,8 @@ module ActionController
# In your integration tests, you can do something like this:
#
# def test_access_granted_from_xml
- # @request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(users(:dhh).name, users(:dhh).password)
- # get "/notes/1.xml"
+ # headers = { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(users(:dhh).name, users(:dhh).password }
+ # get "/notes/1.xml", headers: headers
#
# assert_equal 200, status
# end