From c5d62cb86d958aaa68a4057b3c2578329044e674 Mon Sep 17 00:00:00 2001 From: Ian Ker-Seymer Date: Mon, 23 Feb 2015 18:45:46 -0700 Subject: activemodel: make .model_name json encodable Previously, calling `User.model_name.to_json` would result in an infinite recursion as `.model_name` inherited its `.as_json` behavior from Object. This patch fixes that unexpected behavior by delegating `.as_json` to :name. --- activemodel/test/cases/serializers/json_serialization_test.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activemodel/test') diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index e2eb91eeb0..d765a47636 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -195,4 +195,8 @@ class JsonSerializationTest < ActiveModel::TestCase assert_no_match %r{"awesome":}, json assert_no_match %r{"preferences":}, json end + + test "Class.model_name should be json encodable" do + assert_match %r{"Contact"}, Contact.model_name.to_json + end end -- cgit v1.2.3