Prepare for update to RSpec 3