diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-10 18:43:27 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-10 18:43:27 +0000 |
| commit | b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2 (patch) | |
| tree | caf315b50e65fdb1e82a2d92454d335097c364f8 /activesupport/test/json | |
| parent | a5981517e6676818c3031834627e4a0763ce4fba (diff) | |
| parent | 40a75a509187b6759099a3644b7ae8db9fc14045 (diff) | |
| download | rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.tar.gz rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.tar.bz2 rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'activesupport/test/json')
| -rw-r--r-- | activesupport/test/json/decoding_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index 19ae3a01a8..558b03b90d 100644 --- a/activesupport/test/json/decoding_test.rb +++ b/activesupport/test/json/decoding_test.rb @@ -15,7 +15,8 @@ class TestJSONDecoding < Test::Unit::TestCase # no time zone %({a: "2007-01-01 01:12:34"}) => {'a' => "2007-01-01 01:12:34"}, # needs to be *exact* - %({a: " 2007-01-01 01:12:34 Z "}) => {'a' => " 2007-01-01 01:12:34 Z "}, + %({a: " 2007-01-01 01:12:34 Z "}) => {'a' => " 2007-01-01 01:12:34 Z "}, + %({a: "2007-01-01 : it's your birthday"}) => {'a' => "2007-01-01 : it's your birthday"}, %([]) => [], %({}) => {}, %(1) => 1, |