diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-11-21 11:50:27 -0800 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-11-21 11:50:27 -0800 |
commit | 293c121feeb93544c1f9594bd1bee3ce046301d5 (patch) | |
tree | 70c120d7aa5d06760abb8cf1416641b29c17f1ab /actionpack/test | |
parent | b6793ba110c990ca00bab39a047287bd0bd825f1 (diff) | |
parent | 654a2de7a9c6d58f98dc9d4596cbeba2e5caeca2 (diff) | |
download | rails-293c121feeb93544c1f9594bd1bee3ce046301d5.tar.gz rails-293c121feeb93544c1f9594bd1bee3ce046301d5.tar.bz2 rails-293c121feeb93544c1f9594bd1bee3ce046301d5.zip |
Merge pull request #8183 from jcoglan/objectless_sessions
Store FlashHashes in the session as plain hashes
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/flash_hash_test.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb index ccca0dac17..5490d9394b 100644 --- a/actionpack/test/controller/flash_hash_test.rb +++ b/actionpack/test/controller/flash_hash_test.rb @@ -46,6 +46,27 @@ module ActionDispatch assert_equal({'foo' => 'bar'}, @hash.to_hash) end + def test_to_session_value + @hash['foo'] = 'bar' + assert_equal({'flashes' => {'foo' => 'bar'}, 'discard' => []}, @hash.to_session_value) + + @hash.discard('foo') + assert_equal({'flashes' => {'foo' => 'bar'}, 'discard' => %w[foo]}, @hash.to_session_value) + + @hash.now['qux'] = 1 + assert_equal({'flashes' => {'foo' => 'bar', 'qux' => 1}, 'discard' => %w[foo qux]}, @hash.to_session_value) + + @hash.sweep + assert_equal(nil, @hash.to_session_value) + end + + def test_from_session_value + rails_3_2_cookie = 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWY4ZTFiODE1MmJhNzYwOWMyOGJiYjE3ZWM5MjYzYmE3BjsAVEkiCmZsYXNoBjsARm86JUFjdGlvbkRpc3BhdGNoOjpGbGFzaDo6Rmxhc2hIYXNoCToKQHVzZWRvOghTZXQGOgpAaGFzaHsAOgxAY2xvc2VkRjoNQGZsYXNoZXN7BkkiDG1lc3NhZ2UGOwBGSSIKSGVsbG8GOwBGOglAbm93MA==' + session = Marshal.load(Base64.decode64(rails_3_2_cookie)) + hash = Flash::FlashHash.from_session_value(session['flash']) + assert_equal({'flashes' => {'message' => 'Hello'}, 'discard' => %w[message]}, hash.to_session_value) + end + def test_empty? assert @hash.empty? @hash['zomg'] = 'bears' |