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

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

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index d206511b4616c7053e2d3b7c49e9e8895f5db7be..8bdd6875e014ed8e364871b41781cfccd31cfa84 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,21 +1,31 @@
 FactoryBot.define do
   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 }
 
     user
-    association :creator, :factory => :moderator_user
+    creator :factory => :moderator_user
+
+    trait :zero_hour do
+      now = Time.now.utc
+      created_at { now }
+      ends_at { now }
+    end
 
     trait :needs_view do
-      needs_view true
+      needs_view { true }
+      deactivates_at { nil }
     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
-      association :revoker, :factory => :moderator_user
+      expired
+      revoker :factory => :moderator_user
     end
   end
 end