aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-20 09:05:56 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-20 09:05:56 -0800
commiteff507f44dea66119799ae51910d5786e21d6c81 (patch)
treefe4884d6b1f524ca721f3c6a5ee6522e93bec013 /actionpack/test/controller
parent977183a8100257f98eed6b5cdf71618190c28aad (diff)
parent185c3dbc6ab845edfc94e8d38ef5be11c417dd81 (diff)
downloadrails-eff507f44dea66119799ae51910d5786e21d6c81.tar.gz
rails-eff507f44dea66119799ae51910d5786e21d6c81.tar.bz2
rails-eff507f44dea66119799ae51910d5786e21d6c81.zip
Merge pull request #5082 from willbryant/assigns_should_not_stringify_values_master
assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/test_case_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index c957df88b3..ecba9fed22 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -119,6 +119,7 @@ XML
def test_assigns
@foo = "foo"
+ @foo_hash = {:foo => :bar}
render :nothing => true
end
@@ -292,6 +293,10 @@ XML
assert_equal "foo", assigns("foo")
assert_equal "foo", assigns[:foo]
assert_equal "foo", assigns["foo"]
+
+ # but the assigned variable should not have its own keys stringified
+ expected_hash = { :foo => :bar }
+ assert_equal expected_hash, assigns(:foo_hash)
end
def test_view_assigns