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

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

diff --git a/test/factories/issues.rb b/test/factories/issues.rb
index 6078e5fd0e50312560a7c2976417af2b130d58a7..c575c3398e3fe16108329098316eb2430cb822d4 100644 (file)
--- a/test/factories/issues.rb
+++ b/test/factories/issues.rb
@@ -1,9 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :issue do
     # Default to reporting users
     association :reportable, :factory => :user
+    association :reported_user, :factory => :user
 
-    # reported_user_id
-    association :user, :factory => :user
+    # Default to assigning to an administrator
+    assigned_role { "administrator" }
   end
 end