Switch to new RSpec expect syntax