From 2e5cb980a448e7f4ab00df6e9ad4c1cc456616aa Mon Sep 17 00:00:00 2001 From: Bogdan Gusiev Date: Tue, 19 Dec 2017 15:15:55 +0200 Subject: Fix AM::Serializers::JSON#as_json method for timestamps According to doc the method should return non-json compatible types as strings. --- activemodel/test/cases/serializers/json_serialization_test.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activemodel/test/cases/serializers') 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 -- cgit v1.2.3