add factory girl gem, spec_helper.rb
merge