diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-06 17:26:55 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-06 17:26:55 -0700 |
| commit | 76c2ea7882a83159408bdf1f7c363f442a65c4f1 (patch) | |
| tree | 274b06de880449018c6d4d94cbc6dccb60d7c50b /actionpack/test/controller | |
| parent | 0ca69ca65f83b4bb34f81f077c1c38c66ad868b9 (diff) | |
| download | rails-76c2ea7882a83159408bdf1f7c363f442a65c4f1.tar.gz rails-76c2ea7882a83159408bdf1f7c363f442a65c4f1.tar.bz2 rails-76c2ea7882a83159408bdf1f7c363f442a65c4f1.zip | |
favor composition over inheritance, have FlashHash delegate to a Hash
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/flash_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index a9c4f34275..9c89f1334d 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -174,13 +174,13 @@ class FlashTest < ActionController::TestCase assert_equal(:foo_indeed, flash.discard(:foo)) # valid key passed assert_nil flash.discard(:unknown) # non existant key passed - assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard()) # nothing passed - assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil)) # nothing passed + assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard().to_hash) # nothing passed + assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil).to_hash) # nothing passed assert_equal(:foo_indeed, flash.keep(:foo)) # valid key passed assert_nil flash.keep(:unknown) # non existant key passed - assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep()) # nothing passed - assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil)) # nothing passed + assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep().to_hash) # nothing passed + assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil).to_hash) # nothing passed end def test_redirect_to_with_alert |