Ticket #8803: filter_in_wrong_place_fix_with_test.patch

actionpack/test/controller/filters_test.rb

@@ -350 +350 @@
-    end
-  end
-
+  class RenderingRescuedController < ActionController::Base
+    around_filter :catch_errors
+
+    #make sure the controller complains
+    def rescue_action(e); raise e; end
+
+  private
+    def catch_errors
+      begin
+        yield
+      rescue ErrorToRescue => ex
+        render :text => ex
+      end
+    end
+  end
+
+  class ExceptionInBeforeFilterController < RenderingRescuedController
+    before_filter :load_user
+    
+    def show
+      render :text => "hello"
+    end
+
+  private
+    def load_user
+      raise ErrorToRescue.new("Load user failed.")
+    end
+  end
+
+  class ExceptionInActionController < RenderingRescuedController
+    before_filter :load_user
+
+    def show
+      raise ErrorToRescue.new("Show action failed.")
+    end
+
+  private
+    def load_user
+      @ran_filter ||= []
+      @ran_filter << 'load_user'
+    end
+  end
+
+  class NonYieldingAroundFilterController < ActionController::Base
+    before_filter :filter_one
+    around_filter :yielding_filter
+    before_filter :filter_two
+
+    def index
+      render :inline => "index"
+    end
+
+    #make sure the controller complains
+    def rescue_action(e); raise e; end
+
+  private
+    def filter_one
+      @filters  ||= []
+      @filters  << "filter_one"
+    end
+
+    def filter_two
+      @filters  ||= []
+      @filters  << "filter_two"
+    end
+
+    def yielding_filter
+      @filters  ||= []
+      @filters  << "zomg it didn't yield"
+    end
+  end
+
-  def test_empty_filter_chain
-    assert_equal 0, EmptyFilterChainController.filter_chain.size
-    assert test_process(EmptyFilterChainController).template.assigns['action_executed']
@@ -527 +599 @@
-    assert_equal("I rescued this: #<FilterTest::ErrorToRescue: Something made the bad noise.>", response.body)
-  end
-
+  def test_a_rendering_rescued_around_filter_when_exception_in_before_filter
+    response = nil
+    assert_nothing_raised do
+      response = test_process(ExceptionInBeforeFilterController)
+    end
+    assert_equal "Load user failed.", response.body
+  end
+
+  def test_a_rendering_rescued_around_filter_when_exception_in_action
+    response = nil
+    assert_nothing_raised do
+      response = test_process(ExceptionInActionController)
+    end
+    assert_equal "Show action failed.", response.body
+  end
+
+  def test_non_yielding_around_filters
+    controller = NonYieldingAroundFilterController.new
+    assert_nothing_raised do
+      test_process(controller, "index")
+    end
+  end
+
-  private
-    def test_process(controller, action = "show")
-      request = ActionController::TestRequest.new

actionpack/lib/action_controller/filters.rb

@@ -714 +714 @@
-        return index if aborted || nesting != 0
-
-        # if an around filter catches an exception during rendering and handles it, e.g.
-
+and before 
-        # chain. so skip over these.
-filter.type == :around
+[:around, :before].include?(filter.type)
-
-        # run after filters, if any
-        while chain[index]