shortened shoulda matcher style does not work for forms
Merge remote-tracking branch 'origin/master'