refs5655 rspecの記述不正の修正
Merge branch 'master' into spec_model_user