Fix specs to run with Ruby 2.0, clean up deprecated RSpec syntax

Spec fix taken from https://github.com/heroku/databasedotcom/commit/f402a0d57d6d3223e2fff5f1ebd96a8842ec804c

RSpec deprecation fixes by me, since they caused enough noise to make it hard to tell if the specs has issues or not.