rails/rails — pull request #8200 by floehopper (2012-11-13 08:32:44+00:00)
Title: Fix 3-2-stable to work with Mocha v0.13.0

Two commits (716bdfc01d45a61d211dbd766f494cb984fc9f9c & c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f) are fixes for problems that existed prior to the release of Mocha v0.13.0, but have remained unnoticed.

The other two commits (5573c1d29565f17aca48b6a320a676bf9f962f20 & 3791cac8747b5e36fe9619301a55d69f8feff982) fix Rails v3.2 to work with Mocha v0.13.0.