Merge branch 'master' into feature/add-communities-page

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 69d5ba376471b2684b6fff8ba31cdb4e45af39c6..cdc606cf1d66f6087514156b5192fc6e55eb3238 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -6,8 +6,12 @@ FactoryBot.define do
 
     # These attributes are not the defaults, but in most tests we want
     # a 'normal' user who can log in without being redirected etc.
 
     # 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" }
+    after(:build) do |user, _evaluator|
+      user.activate
+    end
+

     terms_seen { true }
     terms_seen { true }

+    terms_agreed { Time.now.utc }

     data_public { true }
 
     trait :with_home_location do
     data_public { true }
 
     trait :with_home_location do


@@ -16,23 +20,31 @@ FactoryBot.define do
     end
 
     trait :pending do
     end
 
     trait :pending do

-      status { "pending" }
+      after(:build) do |user, _evaluator|
+        user.deactivate
+      end

     end
 
     trait :active do
     end
 
     trait :active do

-      status { "active" }
+      # status { "active" }

     end
 
     trait :confirmed do
     end
 
     trait :confirmed do

-      status { "confirmed" }
+      after(:build) do |user, _evaluator|
+        user.confirm
+      end

     end
 
     trait :suspended do
     end
 
     trait :suspended do

-      status { "suspended" }
+      after(:build) do |user, _evaluator|
+        user.suspend
+      end

     end
 
     trait :deleted do
     end
 
     trait :deleted do

-      status { "deleted" }
+      after(:build) do |user, _evaluator|
+        user.soft_destroy
+      end

     end
 
     factory :moderator_user do
     end
 
     factory :moderator_user do