From a0f74092a8fa1eff96de67b70c711fd8408a4ab5 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 18 Oct 2006 00:04:47 +0000 Subject: test deprecated instance variables using to_s instead of inspect which touches other ivars git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/deprecated_instance_variables_test.rb | 6 +++--- actionpack/test/template/deprecated_instance_variables_test.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/actionpack/test/controller/deprecated_instance_variables_test.rb b/actionpack/test/controller/deprecated_instance_variables_test.rb index f8b8f4352b..7865a69e30 100644 --- a/actionpack/test/controller/deprecated_instance_variables_test.rb +++ b/actionpack/test/controller/deprecated_instance_variables_test.rb @@ -12,9 +12,9 @@ class DeprecatedControllerInstanceVariablesTest < Test::Unit::TestCase end ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var| - class_eval "def old_#{var}; render :text => @#{var}.inspect end" - class_eval "def new_#{var}; render :text => #{var}.inspect end" - class_eval "def internal_#{var}; render :text => @_#{var}.inspect end" + class_eval "def old_#{var}; render :text => @#{var}.to_s end" + class_eval "def new_#{var}; render :text => #{var}.to_s end" + class_eval "def internal_#{var}; render :text => @_#{var}.to_s end" end def rescue_action(e) raise e end diff --git a/actionpack/test/template/deprecated_instance_variables_test.rb b/actionpack/test/template/deprecated_instance_variables_test.rb index 277ecdf93d..c6931ae9c2 100644 --- a/actionpack/test/template/deprecated_instance_variables_test.rb +++ b/actionpack/test/template/deprecated_instance_variables_test.rb @@ -8,8 +8,8 @@ class DeprecatedViewInstanceVariablesTest < Test::Unit::TestCase ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var| class_eval <<-end_eval - def old_#{var}_inline; render :inline => '<%= @#{var}.inspect %>' end - def new_#{var}_inline; render :inline => '<%= #{var}.inspect %>' end + def old_#{var}_inline; render :inline => '<%= @#{var}.to_s %>' end + def new_#{var}_inline; render :inline => '<%= #{var}.to_s %>' end def old_#{var}_partial; render :partial => '#{var}_ivar' end def new_#{var}_partial; render :partial => '#{var}_method' end end_eval -- cgit v1.2.3