Switch to using 'expect' in Rspec files