aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/test/controller/deprecated_instance_variables_test.rb6
-rw-r--r--actionpack/test/template/deprecated_instance_variables_test.rb4
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