diff options
| author | Kir Shatrov <shatrov@me.com> | 2015-01-04 10:35:06 +0100 |
|---|---|---|
| committer | Kir Shatrov <shatrov@me.com> | 2015-01-29 14:44:46 +0200 |
| commit | baf14ae513337cb185acf865e93dfc48f3aabf6a (patch) | |
| tree | 77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/dispatch/session | |
| parent | 069b72aaf04d2caef76f8e71f320716129f2d949 (diff) | |
| download | rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.gz rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.tar.bz2 rails-baf14ae513337cb185acf865e93dfc48f3aabf6a.zip | |
Switch to kwargs in ActionController::TestCase and ActionDispatch::Integration
Non-kwargs requests are deprecated now.
Guides are updated as well.
`post url, nil, nil, { a: 'b' }` doesn't make sense.
`post url, params: { y: x }, session: { a: 'b' }` would be an explicit way to do the same
Diffstat (limited to 'actionpack/test/dispatch/session')
| -rw-r--r-- | actionpack/test/dispatch/session/cookie_store_test.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/dispatch/session/mem_cache_store_test.rb | 2 |
2 files changed, 7 insertions, 5 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 = {}) diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb index f7a06cfed4..fbd82945cc 100644 --- a/actionpack/test/dispatch/session/mem_cache_store_test.rb +++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb @@ -172,7 +172,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest reset! - get '/set_session_value', :_session_id => session_id + get '/set_session_value', params: { _session_id: session_id } assert_response :success assert_not_equal session_id, cookies['_session_id'] end |