Upgrade to RSpec 3