Permalink
Browse files

Fixup mocha tests for 0.5.6. Closes #10602 [murphy, mikong]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 07392bf commit 1bb208d7e5c7147ed12e1e2fd0cd24b5054eceac @jeremy jeremy committed Dec 29, 2007
Showing with 4 additions and 1 deletion.
  1. +4 −1 actionpack/test/controller/base_test.rb
@@ -87,7 +87,10 @@ def test_action_methods
# Mocha adds some public instance methods to Object that would be
# considered actions, so explicitly hide_action them.
def hide_mocha_methods_from_controller(controller)
- mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify, :__metaclass__, :__is_a__]
+ mocha_methods = [
+ :expects, :mocha, :mocha_inspect, :reset_mocha, :stubba_object,
+ :stubba_method, :stubs, :verify, :__metaclass__, :__is_a__, :to_matcher,
+ ]
controller.class.send!(:hide_action, *mocha_methods)
end
end

0 comments on commit 1bb208d

Please sign in to comment.