Use redactions factory in redaction controller test.

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

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 9ec4e20306a966b4e52bfd29efc978ef8064bd9b..8fe768410594dd8e4bf63bc60bab9bdb699a2ec3 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,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