Merge branch 'pull/5117'

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 48a124adb7c0fe9872cf1513ebb37eca461ea8ef..7f1f14e9c6a9a0c90baf6a07bb6174e5914fcafe 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,14 +1,19 @@
+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}" }
 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.
 
     # 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.getutc }
+    terms_agreed { Time.now.utc }

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


@@ -17,23 +22,37 @@ 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 :importer_user do
+      after(:create) do |user, _evaluator|
+        create(:user_role, :role => "importer", :user => user)
+      end

     end
 
     factory :moderator_user do
     end
 
     factory :moderator_user do