Merge branch 'pull/4985'

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

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index b73e599b864757b370adda699951a4fc221a5a43..8bdd6875e014ed8e364871b41781cfccd31cfa84 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,25 +1,31 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }

-    ends_at Time.now + 1.day
+    ends_at { Time.now.utc + 1.day }
+    deactivates_at { ends_at }

 
 

-    # FIXME: requires User factory
-    user_id 13
+    user
+    creator :factory => :moderator_user

 
 

-    # FIXME: requires User factory
-    creator_id 15
+    trait :zero_hour do
+      now = Time.now.utc
+      created_at { now }
+      ends_at { now }
+    end

 
     trait :needs_view do
 
     trait :needs_view do

-      needs_view true
+      needs_view { true }
+      deactivates_at { nil }

     end
 
     trait :expired do
     end
 
     trait :expired do

-      ends_at Time.now - 1.day
+      created_at { Time.now.utc - 2.days }
+      ends_at { Time.now.utc - 1.day }

     end
 
     trait :revoked do
     end
 
     trait :revoked do

-      # FIXME: requires User factory
-      revoker_id 5
+      expired
+      revoker :factory => :moderator_user

     end
   end
 end
     end
   end
 end