rails/rails — pull request #5945 by sikachu (2012-04-23 22:02:01+00:00)
Title: Fix mocha compatibility in 3-2-stable

Mocha is explicitly using Object#method when stubbing a method. So, I've made Request#method to acts like Object#method if there's an argument passed to it.

Also, there's a bad merge conflict that doesn't allow the test to even run. I've fixed that as well.