X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/685df702ef6f3e8feac2dca08808cd9ace066a0d..40d7a0bc27a991a5360a99e823dc75f3ec19fde9:/test/factories/user.rb?ds=sidebyside diff --git a/test/factories/user.rb b/test/factories/user.rb index 8fe768410..48a124adb 100644 --- a/test/factories/user.rb +++ b/test/factories/user.rb @@ -1,14 +1,15 @@ -FactoryGirl.define do +FactoryBot.define do factory :user do sequence(:email) { |n| "user#{n}@example.com" } sequence(:display_name) { |n| "User #{n}" } - pass_crypt Digest::MD5.hexdigest("test") + pass_crypt { Digest::MD5.hexdigest("test") } # These attributes are not the defaults, but in most tests we want # a 'normal' user who can log in without being redirected etc. - status "active" - terms_seen true - data_public true + status { "active" } + terms_seen { true } + terms_agreed { Time.now.getutc } + data_public { true } trait :with_home_location do home_lat { rand(-90.0...90.0) } @@ -16,23 +17,23 @@ FactoryGirl.define do end trait :pending do - status "pending" + status { "pending" } end trait :active do - status "active" + status { "active" } end trait :confirmed do - status "confirmed" + status { "confirmed" } end trait :suspended do - status "suspended" + status { "suspended" } end trait :deleted do - status "deleted" + status { "deleted" } end factory :moderator_user do