mirror of
https://github.com/github/rails.git
synced 2026-01-30 08:48:06 -05:00
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
This commit is contained in:
@@ -87,7 +87,10 @@ class ControllerInstanceTests < Test::Unit::TestCase
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user