From 71566c357308da8ab3fa86794ef57b853f99ce63 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 14 Jan 2012 18:28:09 -0200 Subject: Remove rescue_action from compatibility module and tests --- actionpack/test/controller/filters_test.rb | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'actionpack/test/controller/filters_test.rb') diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index 9ad0dc75f5..c64628890e 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -165,8 +165,6 @@ class FilterTest < ActionController::TestCase @ran_filter ||= [] @ran_filter << "clean_up_tmp" end - - def rescue_action(e) raise(e) end end class ConditionalCollectionFilterController < ConditionalFilterController @@ -454,11 +452,6 @@ class FilterTest < ActionController::TestCase def show raise ErrorToRescue.new("Something made the bad noise.") end - - private - def rescue_action(exception) - raise exception - end end class NonYieldingAroundFilterController < ActionController::Base @@ -472,9 +465,6 @@ class FilterTest < ActionController::TestCase render :inline => "index" end - #make sure the controller complains - def rescue_action(e); raise e; end - private def filter_one @@ -828,8 +818,6 @@ end class PostsController < ActionController::Base - def rescue_action(e); raise e; end - module AroundExceptions class Error < StandardError ; end class Before < Error ; end -- cgit v1.2.3 From 67c96ab024f008ad1aee8345c1ae0fd7aa9bf072 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 22:07:20 -0200 Subject: Move render_to_body logic to return a spaced string to AC::Rendering This seems to be required only when calling render :partial with an empty collection from a controller. This call happens to return no content, letting the response body empty, which means to Rails that it should go on and try to find a template to render based on the current action name, thus failing hard. Although tests keep all green, we need to check a better way to fix this. --- actionpack/test/controller/filters_test.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'actionpack/test/controller/filters_test.rb') diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index c64628890e..046396b37c 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -815,8 +815,6 @@ class FilterTest < ActionController::TestCase end end - - class PostsController < ActionController::Base module AroundExceptions class Error < StandardError ; end -- cgit v1.2.3