Ticket #2241: throw-to-abort-filters.patch

actionpack/test/controller/filters_test.rb

@@ -216 +216 @@
-      end
-  end
-
+  class AbortingFilterController < ActionController::Base
+    before_filter :aborting_request
+
+    def show
+      render_text "ran action"
+    end
+
+    private
+      def aborting_request
+        throw :abort
+      end
+
+      def rescue_action(e) raise(e) end
+  end
+
-  def test_added_filter_to_inheritance_graph
-    assert_equal [ :fire_flash, :ensure_login ], TestController.before_filters
-  end
@@ -342 +357 @@
-    end
-  end
-
+  def test_prevent_filter_execution_by_throwing_abort
+    response = test_process(AbortingFilterController)
+    assert response.body.empty?, 'nothing should have been rendered'
+  end
+
-  private
-    def test_process(controller, action = "show")
-      request = ActionController::TestRequest.new

actionpack/lib/action_controller/filters.rb

@@ -297 +297 @@
-      end
-
-      # Calls all the defined before-filter filters, which are added by using "before_filter :method".
-
+
+
+
+
+
-      def before_action #:doc:
-
+
+
+
+
+
-      end
-
-      # Calls all the defined after-filter filters, which are added by using "after_filter :method".