Converted to new RSpec syntax