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

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 8fe768410594dd8e4bf63bc60bab9bdb699a2ec3..166461637662609dc6bdb58c08cb87f3c9e17ddc 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,14 +1,18 @@
-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
+    after(:build) do |user, _evaluator|
+      user.activate
+    end
+
+    terms_seen { true }
+    terms_agreed { Time.now.utc }
+    data_public { true }
 
     trait :with_home_location do
       home_lat { rand(-90.0...90.0) }
@@ -16,23 +20,37 @@ FactoryGirl.define do
     end
 
     trait :pending do
-      status "pending"
+      after(:build) do |user, _evaluator|
+        user.deactivate
+      end
     end
 
     trait :active do
-      status "active"
+      # status { "active" }
     end
 
     trait :confirmed do
-      status "confirmed"
+      after(:build) do |user, _evaluator|
+        user.confirm
+      end
     end
 
     trait :suspended do
-      status "suspended"
+      after(:build) do |user, _evaluator|
+        user.suspend
+      end
     end
 
     trait :deleted do
-      status "deleted"
+      after(:build) do |user, _evaluator|
+        user.soft_destroy
+      end
+    end
+
+    factory :importer_user do
+      after(:create) do |user, _evaluator|
+        create(:user_role, :role => "importer", :user => user)
+      end
     end
 
     factory :moderator_user do