Merge remote branch 'rails/master'

1 files changed, 12 insertions, 2 deletions

diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 0ce1dc506b..232a1679e0 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -47,8 +47,12 @@ module AbstractController
       end
       
       def index
-        self.response_body = @text
-      end      
+        self.response_body = @text.to_s
+      end
+    end
+
+    class Callback2Overwrite < Callback2
+      before_filter :first, :except => :index
     end
     
     class TestCallbacks2 < ActiveSupport::TestCase
@@ -70,6 +74,12 @@ module AbstractController
         @controller.process(:index)
         assert_equal "FIRSTSECOND", @controller.instance_variable_get("@aroundz")
       end
+
+      test "before_filter with overwritten condition" do
+        @controller = Callback2Overwrite.new
+        result = @controller.process(:index)
+        assert_equal "", @controller.response_body
+      end
     end
     
     class Callback3 < ControllerWithCallbacks