From e1ae39122caedeff7f2c3841892f187f12847002 Mon Sep 17 00:00:00 2001
From: mhuggins <matt.huggins@gmail.com>
Date: Thu, 5 Nov 2015 23:03:31 -0700
Subject: [PATCH] Fix failing tests

---
 test/serialization_test.rb | 2 +-
 test/serializer_test.rb    | 2 ++
 test/test_fakes.rb         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/serialization_test.rb b/test/serialization_test.rb
index a9285820..121e7fd8 100644
--- a/test/serialization_test.rb
+++ b/test/serialization_test.rb
@@ -242,7 +242,7 @@ class RenderJsonTest < ActionController::TestCase
 
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
-    assert_equal 'alert({"hello":"world"})', @response.body
+    assert_equal '/**/alert({"hello":"world"})', @response.body
     # For JSONP, Rails 3 uses application/json, but Rails 4 uses text/javascript
     assert_match %r(application/json|text/javascript), @response.content_type.to_s
   end
diff --git a/test/serializer_test.rb b/test/serializer_test.rb
index 2ef49a87..27de686b 100644
--- a/test/serializer_test.rb
+++ b/test/serializer_test.rb
@@ -1363,6 +1363,7 @@ class SerializerTest < ActiveModel::TestCase
   def test_inheritance_does_not_used_cached_attributes
     parent = Class.new(ActiveModel::Serializer) do
       attributes :title
+      alias :read_attribute_for_serialization :send
     end
 
     child = Class.new(parent) do
@@ -1371,6 +1372,7 @@ class SerializerTest < ActiveModel::TestCase
 
     data_class = Class.new do
       attr_accessor :title, :body
+      alias :read_attribute_for_serialization :send
     end
 
     item = data_class.new
diff --git a/test/test_fakes.rb b/test/test_fakes.rb
index dd2039e9..98228ef8 100644
--- a/test/test_fakes.rb
+++ b/test/test_fakes.rb
@@ -199,6 +199,7 @@ class SomeSerializer < ActiveModel::Serializer
 end
 
 class SomeObject < Struct.new(:some)
+  alias :read_attribute_for_serialization :send
 end
 
 # Set up some classes for polymorphic testing