diff options
author | Rémy Coutable <remy@rymai.me> | 2017-05-03 18:25:31 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-05-04 18:04:36 +0300 |
commit | f1ace97f8bdc69edc481b545b779721322cec95c (patch) | |
tree | f7cc903c0c8b4b64e743a07016e0325d7d5c0fea /spec/factories/users.rb | |
parent | d3768dd79698ae17cd0c82b7c78a8ead11b7e157 (diff) |
Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaee
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/factories/users.rb')
-rw-r--r-- | spec/factories/users.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/users.rb b/spec/factories/users.rb index e1ae94a08e4..33fa80772ff 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -29,6 +29,10 @@ FactoryGirl.define do after(:build) { |user, _| user.block! } end + trait :with_avatar do + avatar { File.open(Rails.root.join('spec/fixtures/dk.png')) } + end + trait :two_factor_via_otp do before(:create) do |user| user.otp_required_for_login = true |