diff options
Diffstat (limited to 'actionpack/test')
4 files changed, 37 insertions, 6 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 0ef31cb851..56b1752392 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -54,7 +54,7 @@ class ActionPackAssertionsController < ActionController::Base end def render_based_on_parameters - render_text "Mr. #{@params["name"]}" + render_text "Mr. #{params[:name]}" end def render_url diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb index 075bc98a28..57e3b21acf 100644 --- a/actionpack/test/controller/components_test.rb +++ b/actionpack/test/controller/components_test.rb @@ -46,7 +46,7 @@ end class CalleeController < ActionController::Base def being_called - render_text "#{@params["name"] || "Lady"} of the House, speaking" + render_text "#{params[:name] || "Lady"} of the House, speaking" end def blowing_up diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb index dc95c4b8a1..a3a913d42f 100644 --- a/actionpack/test/controller/verification_test.rb +++ b/actionpack/test/controller/verification_test.rb @@ -34,15 +34,15 @@ class VerificationTest < Test::Unit::TestCase verify :only => :must_be_post, :method => :post, :render => { :status => 405, :text => "Must be post" }, :add_headers => { "Allow" => "POST" } def guarded_one - render :text => "#{@params["one"]}" + render :text => "#{params[:one]}" end def guarded_with_flash - render :text => "#{@params["one"]}" + render :text => "#{params[:one]}" end def guarded_two - render :text => "#{@params["one"]}:#{@params["two"]}" + render :text => "#{params[:one]}:#{params[:two]}" end def guarded_in_session @@ -70,7 +70,7 @@ class VerificationTest < Test::Unit::TestCase end def unguarded - render :text => "#{@params["one"]}" + render :text => "#{params[:one]}" end def two_redirects diff --git a/actionpack/test/template/deprecated_instance_variables_test.rb b/actionpack/test/template/deprecated_instance_variables_test.rb new file mode 100644 index 0000000000..86fc7d6139 --- /dev/null +++ b/actionpack/test/template/deprecated_instance_variables_test.rb @@ -0,0 +1,31 @@ +require File.dirname(__FILE__) + '/../abstract_unit' + +class DeprecatedInstanceVariablesTest < Test::Unit::TestCase + class Target < ActionController::Base + 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 + end_eval + end + + def rescue_action(e) raise e end + end + + def setup + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + @controller = Target.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} } + end + def test_new_#{var}_isnt_deprecated + assert_not_deprecated { get :new_#{var} } + end + end_eval + end +end |