Make all factory-generated users 'normal'

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index a7219324a8f6c99d7b68195f1d2af6667901d412..802fedd91c71cdb25e4e053b04ff287b36211b4a 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -4,6 +4,12 @@ FactoryGirl.define do
     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,12 +46,5 @@ FactoryGirl.define do
         create(:user_role, :role => "administrator", :user => user)
       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
-    end
   end
 end