X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0bd2e9ea8c801e5b6cd570837fcd112f6f78b180..00bd64c7fb86d598eb9406e39f99fc711f58bf9b:/test/factories/user.rb

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 9ec4e2030..d6ee1fa8c 100644
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,9 +1,15 @@
-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")
 
+    # 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
+
     trait :with_home_location do
       home_lat { rand(-90.0...90.0) }
       home_lon { rand(-180.0...180.0) }
@@ -40,5 +46,13 @@ FactoryGirl.define do
         create(:user_role, :role => "administrator", :user => user)
       end
     end
+
+    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