Clean code generating a deprecation warning

should_not_receive can't be used with and_return
See https://github.com/rspec/rspec-mocks/issues/134
Merge branch 'should_not_receive_deprecation_warning' of git://github.com/Cyril-sf/koala into Cyril-sf-should_not_receive_deprecation_warning