Mocha 0.5.6 breaks ActionController test

Hi guys,

Could a core committer review and apply http://dev.rubyonrails.org/ticket/10602?
This would get rid of a failing test with the latest version of mocha
(0.5.6).

Thanks much!

Cheers,
Chu Yeow