Use rspec 'expect' syntax where possible