diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-11 17:31:51 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-11 17:31:51 -0800 |
commit | bdca6686742cecb6e198d2ddf0023189264d40fa (patch) | |
tree | bbf7ead3b7801622d1cad738ba755fac97caf285 /actionpack/test | |
parent | 134fa4f886e86d7eea87044ab5610bb70ff5ee24 (diff) | |
parent | 96a6703ed9c0e64a01ce729dc8c2c6c19bea7903 (diff) | |
download | rails-bdca6686742cecb6e198d2ddf0023189264d40fa.tar.gz rails-bdca6686742cecb6e198d2ddf0023189264d40fa.tar.bz2 rails-bdca6686742cecb6e198d2ddf0023189264d40fa.zip |
Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetch
Make ActionDispatch::Request::Session#fetch behave like Hash#fetch
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/request/session_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb index a244d1364c..df55fcc8bc 100644 --- a/actionpack/test/dispatch/request/session_test.rb +++ b/actionpack/test/dispatch/request/session_test.rb @@ -68,13 +68,12 @@ module ActionDispatch assert_equal '1', session.fetch(:one) assert_equal '2', session.fetch(:two, '2') - assert_equal '2', session.fetch(:two) + assert_nil session.fetch(:two, nil) assert_equal 'three', session.fetch(:three) {|el| el.to_s } - assert_equal 'three', session.fetch(:three) assert_raise KeyError do - session.fetch(:four) + session.fetch(:three) end end |