From ab5d40f38b2b7c8c9155292938f21f3af0fa8027 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Wed, 3 Apr 2013 23:56:06 -0700 Subject: [PATCH] Sigh. When I did 9551a974642d5b3e99068290a90e67bd27a41b0d, I forgot that some new code may use it. --- test/serialization_scope_name_test.rb | 4 ++-- test/serialization_test.rb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/serialization_scope_name_test.rb b/test/serialization_scope_name_test.rb index 07d2de8b..d3db103c 100644 --- a/test/serialization_scope_name_test.rb +++ b/test/serialization_scope_name_test.rb @@ -21,7 +21,7 @@ class DefaultScopeNameTest < ActionController::TestCase end def render_new_user - respond_with TestUser.new('pete', false), :serializer => UserSerializer + render :json => TestUser.new('pete', false), :serializer => UserSerializer end end @@ -54,7 +54,7 @@ class SerializationScopeNameTest < ActionController::TestCase end def render_new_user - respond_with TestUser.new('pete', false), :serializer => AdminUserSerializer + render :json => TestUser.new('pete', false), :serializer => AdminUserSerializer end end diff --git a/test/serialization_test.rb b/test/serialization_test.rb index 3aad0118..c5e1bbe3 100644 --- a/test/serialization_test.rb +++ b/test/serialization_test.rb @@ -84,7 +84,6 @@ class RenderJsonTest < ActionController::TestCase end class TestController < ActionController::Base - include ::ActionController::Serialization::RenderJsonOverride protect_from_forgery serialization_scope :current_user