1 files changed, 202 insertions, 0 deletions
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
new file mode 100644
index 0000000000..50b36a0567
--- /dev/null
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -0,0 +1,202 @@
+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_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({'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_from_session_value_on_json_serializer
+      decrypted_data = "{ \"session_id\":\"d98bdf6d129618fc2548c354c161cfb5\", \"flash\":{\"discard\":[], \"flashes\":{\"message\":\"hey you\"}} }"
+      session = ActionDispatch::Cookies::JsonSerializer.load(decrypted_data)
+      hash = Flash::FlashHash.from_session_value(session['flash'])
+
+      assert_equal({'discard' => %w[message], 'flashes' => { 'message' => 'hey you'}}, hash.to_session_value)
+      assert_equal "hey you", hash[:message]
+      assert_equal "hey you", hash["message"]
+    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