Deprecation: test deprecated instance vars in partials.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4824 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2006-08-26 05:58:16 +00:00
parent 7b34d0f8c5
commit 96c6ca369a
9 changed files with 29 additions and 9 deletions

@ -1,6 +1,8 @@
*SVN*
* Changed the POST parameter processing to use the new QueryStringParser [DHH]
* Deprecation: test deprecated instance vars in partials. [Jeremy Kemper]
* Changed the POST parameter processing to use the new QueryStringParser and make the result a indifferent hash [DHH]
* Add UrlWriter to allow writing urls from Mailers and scripts. [Nicholas Seckar]

@ -1,6 +1,6 @@
require File.dirname(__FILE__) + '/../abstract_unit'
class DeprecatedInstanceVariablesTest < Test::Unit::TestCase
class DeprecatedControllerInstanceVariablesTest < Test::Unit::TestCase
class Target < ActionController::Base
def initialize(run = nil)
instance_eval(run) if run

@ -0,0 +1 @@
<%= @flash[:test] %>

@ -0,0 +1 @@
<%= flash[:test] %>

@ -0,0 +1 @@
<%= @params[:test] %>

@ -0,0 +1 @@
<%= params[:test] %>

@ -0,0 +1 @@
<%= @session[:test] %>

@ -0,0 +1 @@
<%= session[:test] %>

@ -1,11 +1,17 @@
require File.dirname(__FILE__) + '/../abstract_unit'
class DeprecatedInstanceVariablesTest < Test::Unit::TestCase
class Target < ActionController::Base
class DeprecatedViewInstanceVariablesTest < Test::Unit::TestCase
class DeprecatedInstanceVariablesController < ActionController::Base
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
def self.controller_path; 'deprecated_instance_variables' end
ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var|
class_eval <<-end_eval
def old_#{var}; render :inline => '<%= @#{var}.inspect %>' end
def new_#{var}; render :inline => '<%= #{var}.inspect %>' end
def old_#{var}_inline; render :inline => '<%= @#{var}.inspect %>' end
def new_#{var}_inline; render :inline => '<%= #{var}.inspect %>' end
def old_#{var}_partial; render :partial => '#{var}_ivar' end
def new_#{var}_partial; render :partial => '#{var}_method' end
end_eval
end
@ -15,16 +21,22 @@ def rescue_action(e) raise e end
def setup
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
@controller = Target.new
@controller = DeprecatedInstanceVariablesController.new
end
ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var|
class_eval <<-end_eval, __FILE__, __LINE__
def test_old_#{var}_is_deprecated
assert_deprecated('@#{var}') { get :old_#{var} }
assert_deprecated('@#{var}') { get :old_#{var}_inline }
end
def test_new_#{var}_isnt_deprecated
assert_not_deprecated { get :new_#{var} }
assert_not_deprecated { get :new_#{var}_inline }
end
def test_old_#{var}_partial_is_deprecated
assert_deprecated('@#{var}') { get :old_#{var}_partial }
end
def test_new_#{var}_partial_isnt_deprecated
assert_not_deprecated { get :new_#{var}_partial }
end
end_eval
end