Upgrade to rspec 3