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

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index a7219324a8f6c99d7b68195f1d2af6667901d412..5b92345c2dbcf0f356be857b7432018dec6abef5 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,8 +1,18 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }

-    pass_crypt Digest::MD5.hexdigest("test")
+    pass_crypt { PasswordHash.create("test").first }
+
+    # These attributes are not the defaults, but in most tests we want
+    # a 'normal' user who can log in without being redirected etc.
+    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) }
 
     trait :with_home_location do
       home_lat { rand(-90.0...90.0) }


@@ -10,23 +20,37 @@ FactoryGirl.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


@@ -41,11 +65,12 @@ FactoryGirl.define do
       end
     end
 
       end
     end
 

-    # A commonly needed user is one who can log in an isn't redirected anywhere
-    factory :normal_user do
-      status "active"
-      terms_seen true
-      data_public true
+    factory :super_user do
+      after(:create) do |user, _evaluator|
+        UserRole::ALL_ROLES.each do |role|
+          create(:user_role, :role => role, :user => user)
+        end
+      end

     end
   end
 end
     end
   end
 end