diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-29 11:51:32 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-29 11:51:32 -0200 |
| commit | a35ec0c02235e7e332f8551a6c94c69ac929a1bf (patch) | |
| tree | 77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/dispatch/session/cookie_store_test.rb | |
| parent | 069b72aaf04d2caef76f8e71f320716129f2d949 (diff) | |
| parent | baf14ae513337cb185acf865e93dfc48f3aabf6a (diff) | |
| download | rails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.tar.gz rails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.tar.bz2 rails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.zip | |
Merge pull request #18323 from kirs/controller-test-kwargs
Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods
Diffstat (limited to 'actionpack/test/dispatch/session/cookie_store_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/session/cookie_store_test.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb index c5cd24d06e..3cdd72f4f4 100644 --- a/actionpack/test/dispatch/session/cookie_store_test.rb +++ b/actionpack/test/dispatch/session/cookie_store_test.rb @@ -125,7 +125,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest def test_does_set_secure_cookies_over_https with_test_route_set(:secure => true) do - get '/set_session_value', nil, 'HTTPS' => 'on' + get '/set_session_value', headers: {'HTTPS' => 'on'} assert_response :success assert_equal "_myapp_session=#{response.body}; path=/; secure; HttpOnly", headers['Set-Cookie'] @@ -331,9 +331,11 @@ class CookieStoreTest < ActionDispatch::IntegrationTest private # Overwrite get to send SessionSecret in env hash - def get(path, parameters = nil, env = {}) - env["action_dispatch.key_generator"] ||= Generator - super + def get(path, *args) + args[0] ||= {} + args[0][:headers] ||= {} + args[0][:headers]["action_dispatch.key_generator"] ||= Generator + super(path, *args) end def with_test_route_set(options = {}) |