From 2c9c36e21f5e414855db00e26d3d6d70db64f446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moura?= Date: Sun, 10 May 2015 03:58:18 -0300 Subject: [PATCH] adding json_api as default adapter --- lib/active_model/serializer/configuration.rb | 2 +- test/fixtures/poro.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/active_model/serializer/configuration.rb b/lib/active_model/serializer/configuration.rb index ef57262c..b46cf8a5 100644 --- a/lib/active_model/serializer/configuration.rb +++ b/lib/active_model/serializer/configuration.rb @@ -6,7 +6,7 @@ module ActiveModel included do |base| base.config.array_serializer = ActiveModel::Serializer::ArraySerializer - base.config.adapter = :json + base.config.adapter = :json_api end end end diff --git a/test/fixtures/poro.rb b/test/fixtures/poro.rb index b66395c3..986178fe 100644 --- a/test/fixtures/poro.rb +++ b/test/fixtures/poro.rb @@ -1,3 +1,5 @@ +ActiveModel::Serializer.config.adapter = :json + class Model def initialize(hash={}) @attributes = hash @@ -64,7 +66,7 @@ Author = Class.new(Model) Bio = Class.new(Model) Blog = Class.new(Model) Role = Class.new(Model) -User = Class.new(Model) +User = Class.new(Model) Location = Class.new(Model) Place = Class.new(Model)