diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-08-11 10:37:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-11 10:37:49 -0400 |
commit | 09e1452eeba395ce475b087070273e4765dc2fd4 (patch) | |
tree | bd8e21f5c7c7e21a177b6a1a897f3575d286fafa /activemodel/test/cases | |
parent | 920c9195e0e27077af003973e45d0146a30e51b4 (diff) | |
parent | 2e5cb980a448e7f4ab00df6e9ad4c1cc456616aa (diff) | |
download | rails-09e1452eeba395ce475b087070273e4765dc2fd4.tar.gz rails-09e1452eeba395ce475b087070273e4765dc2fd4.tar.bz2 rails-09e1452eeba395ce475b087070273e4765dc2fd4.zip |
Merge pull request #31503 from bogdan/timestamp-as-json
Fix AM::Serializers::JSON#as_json method for timestamps
Diffstat (limited to 'activemodel/test/cases')
-rw-r--r-- | activemodel/test/cases/serializers/json_serialization_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index aae98c9fe4..6149020d1c 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -129,6 +129,10 @@ class JsonSerializationTest < ActiveModel::TestCase assert_equal :name, options[:except] end + test "as_json should serialize timestamps" do + assert_equal "2006-08-01T00:00:00.000Z", @contact.as_json["created_at"] + end + test "as_json should return a hash if include_root_in_json is true" do begin original_include_root_in_json = Contact.include_root_in_json |