From af2b38c43b53758300ee6d742326486ca1272ea7 Mon Sep 17 00:00:00 2001
From: Andreas Eger <andreas.eger@runtastic.com>
Date: Mon, 4 Apr 2016 09:26:48 +0200
Subject: [PATCH] add require for active_support/json to fix #1656

---
 lib/active_model_serializers.rb | 1 +
 test/test_helper.rb             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb
index 192b414b..15551f4b 100644
--- a/lib/active_model_serializers.rb
+++ b/lib/active_model_serializers.rb
@@ -2,6 +2,7 @@ require 'active_model'
 require 'active_support'
 require 'active_support/core_ext/object/with_options'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/json'
 module ActiveModelSerializers
   extend ActiveSupport::Autoload
   autoload :Model
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 66609eaf..2e9c80f6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -14,7 +14,6 @@ require 'rails'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_controller/railtie'
-require 'active_support/json'
 require 'active_model_serializers'
 require 'fileutils'
 FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__))