upgrade to RSpec 3

#7073 revised