diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 05:16:03 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 05:16:03 +0000 |
| commit | 1bb208d7e5c7147ed12e1e2fd0cd24b5054eceac (patch) | |
| tree | a124f1cd4b52d5060596c618d5c39f6c37c1b8a4 /actionpack/test/controller | |
| parent | 07392bfe879e2582fe92bd09c5ecc8f3bdb9249f (diff) | |
| download | rails-1bb208d7e5c7147ed12e1e2fd0cd24b5054eceac.tar.gz rails-1bb208d7e5c7147ed12e1e2fd0cd24b5054eceac.tar.bz2 rails-1bb208d7e5c7147ed12e1e2fd0cd24b5054eceac.zip | |
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
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/base_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 60e61b6285..749db2918a 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -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 |