Merge remote-tracking branch 'upstream/pull/4917'

[rails.git] / test / factories / user.rb

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 07f1ef679b8a6470bee38c3c986f185e7157a007..7f1f14e9c6a9a0c90baf6a07bb6174e5914fcafe 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,8 +1,10 @@
+pass_crypt = PasswordHash.create("test").first
+
 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 { pass_crypt }
 
     # These attributes are not the defaults, but in most tests we want
     # a 'normal' user who can log in without being redirected etc.
@@ -11,7 +13,7 @@ FactoryBot.define do
     end
 
     terms_seen { true }
-    terms_agreed { Time.now.getutc }
+    terms_agreed { Time.now.utc }
     data_public { true }
 
     trait :with_home_location do
@@ -47,6 +49,12 @@ FactoryBot.define do
       end
     end
 
+    factory :importer_user do
+      after(:create) do |user, _evaluator|
+        create(:user_role, :role => "importer", :user => user)
+      end
+    end
+
     factory :moderator_user do
       after(:create) do |user, _evaluator|
         create(:user_role, :role => "moderator", :user => user)