This change also cleans up some code styles on related specs according to Rubocop todos.
Attach a file by drag & drop or click to upload
