Permalink
Browse files

Fix failing ActionCacheFilter tests due to around filter changes.

  • Loading branch information...
1 parent 1e26284 commit f2f58f535520bfa77ab2d0ad1fb598f18349dd2e Yehuda Katz + Carl Lerche committed May 28, 2009
@@ -93,7 +93,7 @@ def initialize(options, &block)
# TODO: Remove once New Base is merged
if defined?(ActionController::Http)
- def around_process_action(controller)
+ def filter(controller)
should_continue = before(controller)
yield if should_continue
after(controller)
@@ -313,8 +313,8 @@ def #{method_name}(&blk)
#{method_name}_object.send("filter", self, &blk)
# TODO: Deprecate this
elsif #{method_name}_object.respond_to?(:before) && #{method_name}_object.respond_to?(:after)
- #{method_name}_object.before(self)
- yield
+ should_continue = #{method_name}_object.before(self)
+ yield if should_continue
#{method_name}_object.after(self)
else
#{method_name}_object.send("#{kind}_#{name}", self, &blk)

0 comments on commit f2f58f5

Please sign in to comment.