Permalink
Browse files

fix actionpack tests broken by additional mocha methods

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6675 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent d080638 commit d137167ca99e63826a3ac8034f7425b3637f0413 @NZKoz NZKoz committed May 6, 2007
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/test/controller/base_test.rb
View
2 actionpack/test/controller/base_test.rb
@@ -88,7 +88,7 @@ def test_action_methods
# Mocha adds methods to Object which are then included in the public_instance_methods
# This method hides those from the controller so the above tests won't know the difference
def hide_mocha_methods_from_controller(controller)
- mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify]
+ mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify, :__is_a__, :__metaclass__]
controller.class.send(:hide_action, *mocha_methods)
end

0 comments on commit d137167

Please sign in to comment.