diff options
| author | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-12-10 11:44:07 +0530 |
|---|---|---|
| committer | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-12-10 11:44:07 +0530 |
| commit | 0c55335074ed7baf2f165ada168f726f1f7bba68 (patch) | |
| tree | 2a8428d72f6890cb0eb6c5b9b1d40b7b2ce93d8b /activemodel/test/cases/serializers/json_serialization_test.rb | |
| parent | 6b9b0767bf480d53029afeb3f8e86f66e933fb41 (diff) | |
| parent | fe077b50c9ce65c4ac1cc718c34dda45cd24c6fe (diff) | |
| download | rails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.gz rails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.bz2 rails-0c55335074ed7baf2f165ada168f726f1f7bba68.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/test/cases/serializers/json_serialization_test.rb')
| -rw-r--r-- | activemodel/test/cases/serializers/json_serialization_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index e4f5e61e91..bc185c737f 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -198,7 +198,7 @@ class JsonSerializationTest < ActiveModel::TestCase assert_no_match %r{"preferences":}, json end - test "custom as_json options should be extendible" do + test "custom as_json options should be extensible" do def @contact.as_json(options = {}); super(options.merge(only: [:name])); end json = @contact.to_json |