mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
bf876aa0b6
In #18721 we removed the discard key from the session hash used to flash messages and that broke compatibility with Rails 4 applications because they try to map in the discarded flash messages and it returns nil. Fixes #24726.
214 lines
5.6 KiB
Ruby
214 lines
5.6 KiB
Ruby
require 'abstract_unit'
|
|
|
|
module ActionDispatch
|
|
class FlashHashTest < ActiveSupport::TestCase
|
|
def setup
|
|
@hash = Flash::FlashHash.new
|
|
end
|
|
|
|
def test_set_get
|
|
@hash[:foo] = 'zomg'
|
|
assert_equal 'zomg', @hash[:foo]
|
|
end
|
|
|
|
def test_keys
|
|
assert_equal [], @hash.keys
|
|
|
|
@hash['foo'] = 'zomg'
|
|
assert_equal ['foo'], @hash.keys
|
|
|
|
@hash['bar'] = 'zomg'
|
|
assert_equal ['foo', 'bar'].sort, @hash.keys.sort
|
|
end
|
|
|
|
def test_update
|
|
@hash['foo'] = 'bar'
|
|
@hash.update('foo' => 'baz', 'hello' => 'world')
|
|
|
|
assert_equal 'baz', @hash['foo']
|
|
assert_equal 'world', @hash['hello']
|
|
end
|
|
|
|
def test_key
|
|
@hash['foo'] = 'bar'
|
|
|
|
assert @hash.key?('foo')
|
|
assert @hash.key?(:foo)
|
|
assert_not @hash.key?('bar')
|
|
assert_not @hash.key?(:bar)
|
|
end
|
|
|
|
def test_delete
|
|
@hash['foo'] = 'bar'
|
|
@hash.delete 'foo'
|
|
|
|
assert !@hash.key?('foo')
|
|
assert_nil @hash['foo']
|
|
end
|
|
|
|
def test_to_hash
|
|
@hash['foo'] = 'bar'
|
|
assert_equal({'foo' => 'bar'}, @hash.to_hash)
|
|
|
|
@hash.to_hash['zomg'] = 'aaron'
|
|
assert !@hash.key?('zomg')
|
|
assert_equal({'foo' => 'bar'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_to_session_value
|
|
@hash['foo'] = 'bar'
|
|
assert_equal({ 'discard' => [], 'flashes' => { 'foo' => 'bar' } }, @hash.to_session_value)
|
|
|
|
@hash.now['qux'] = 1
|
|
assert_equal({ 'flashes' => { 'foo' => 'bar' }, 'discard' => [] }, @hash.to_session_value)
|
|
|
|
@hash.discard('foo')
|
|
assert_equal(nil, @hash.to_session_value)
|
|
|
|
@hash.sweep
|
|
assert_equal(nil, @hash.to_session_value)
|
|
end
|
|
|
|
def test_from_session_value
|
|
# {"session_id"=>"f8e1b8152ba7609c28bbb17ec9263ba7", "flash"=>#<ActionDispatch::Flash::FlashHash:0x00000000000000 @used=#<Set: {"farewell"}>, @closed=false, @flashes={"greeting"=>"Hello", "farewell"=>"Goodbye"}, @now=nil>}
|
|
rails_3_2_cookie = 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWY4ZTFiODE1MmJhNzYwOWMyOGJiYjE3ZWM5MjYzYmE3BjsAVEkiCmZsYXNoBjsARm86JUFjdGlvbkRpc3BhdGNoOjpGbGFzaDo6Rmxhc2hIYXNoCToKQHVzZWRvOghTZXQGOgpAaGFzaHsGSSINZmFyZXdlbGwGOwBUVDoMQGNsb3NlZEY6DUBmbGFzaGVzewdJIg1ncmVldGluZwY7AFRJIgpIZWxsbwY7AFRJIg1mYXJld2VsbAY7AFRJIgxHb29kYnllBjsAVDoJQG5vdzA='
|
|
session = Marshal.load(Base64.decode64(rails_3_2_cookie))
|
|
hash = Flash::FlashHash.from_session_value(session['flash'])
|
|
assert_equal({'greeting' => 'Hello'}, hash.to_hash)
|
|
assert_equal(nil, hash.to_session_value)
|
|
end
|
|
|
|
def test_from_session_value_on_json_serializer
|
|
decrypted_data = "{ \"session_id\":\"d98bdf6d129618fc2548c354c161cfb5\", \"flash\":{\"discard\":[\"farewell\"], \"flashes\":{\"greeting\":\"Hello\",\"farewell\":\"Goodbye\"}} }"
|
|
session = ActionDispatch::Cookies::JsonSerializer.load(decrypted_data)
|
|
hash = Flash::FlashHash.from_session_value(session['flash'])
|
|
|
|
assert_equal({'greeting' => 'Hello'}, hash.to_hash)
|
|
assert_equal(nil, hash.to_session_value)
|
|
assert_equal "Hello", hash[:greeting]
|
|
assert_equal "Hello", hash["greeting"]
|
|
end
|
|
|
|
def test_empty?
|
|
assert @hash.empty?
|
|
@hash['zomg'] = 'bears'
|
|
assert !@hash.empty?
|
|
@hash.clear
|
|
assert @hash.empty?
|
|
end
|
|
|
|
def test_each
|
|
@hash['hello'] = 'world'
|
|
@hash['foo'] = 'bar'
|
|
|
|
things = []
|
|
@hash.each do |k,v|
|
|
things << [k,v]
|
|
end
|
|
|
|
assert_equal([%w{ hello world }, %w{ foo bar }].sort, things.sort)
|
|
end
|
|
|
|
def test_replace
|
|
@hash['hello'] = 'world'
|
|
@hash.replace('omg' => 'aaron')
|
|
assert_equal({'omg' => 'aaron'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_discard_no_args
|
|
@hash['hello'] = 'world'
|
|
@hash.discard
|
|
|
|
@hash.sweep
|
|
assert_equal({}, @hash.to_hash)
|
|
end
|
|
|
|
def test_discard_one_arg
|
|
@hash['hello'] = 'world'
|
|
@hash['omg'] = 'world'
|
|
@hash.discard 'hello'
|
|
|
|
@hash.sweep
|
|
assert_equal({'omg' => 'world'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_keep_sweep
|
|
@hash['hello'] = 'world'
|
|
|
|
@hash.sweep
|
|
assert_equal({'hello' => 'world'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_update_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash.update({'hi' => 'mom'})
|
|
|
|
@hash.sweep
|
|
assert_equal({'hello' => 'world', 'hi' => 'mom'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_update_delete_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash.delete 'hello'
|
|
@hash.update({'hello' => 'mom'})
|
|
|
|
@hash.sweep
|
|
assert_equal({'hello' => 'mom'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_delete_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash['hi'] = 'mom'
|
|
@hash.delete 'hi'
|
|
|
|
@hash.sweep
|
|
assert_equal({'hello' => 'world'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_clear_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash.clear
|
|
|
|
@hash.sweep
|
|
assert_equal({}, @hash.to_hash)
|
|
end
|
|
|
|
def test_replace_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash.replace({'hi' => 'mom'})
|
|
|
|
@hash.sweep
|
|
assert_equal({'hi' => 'mom'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_discard_then_add
|
|
@hash['hello'] = 'world'
|
|
@hash['omg'] = 'world'
|
|
@hash.discard 'hello'
|
|
@hash['hello'] = 'world'
|
|
|
|
@hash.sweep
|
|
assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_keep_all_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash['omg'] = 'world'
|
|
@hash.discard 'hello'
|
|
@hash.keep
|
|
|
|
@hash.sweep
|
|
assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
|
|
end
|
|
|
|
def test_double_sweep
|
|
@hash['hello'] = 'world'
|
|
@hash.sweep
|
|
|
|
assert_equal({'hello' => 'world'}, @hash.to_hash)
|
|
|
|
@hash.sweep
|
|
assert_equal({}, @hash.to_hash)
|
|
end
|
|
end
|
|
end
|