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

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

diff --git a/test/factories/issues.rb b/test/factories/issues.rb
index b6dec44786648b3713318f0e5f0594637614b0be..cc6b4c3671576cd241f07732939068cf730107eb 100644 (file)
--- a/test/factories/issues.rb
+++ b/test/factories/issues.rb
@@ -1,7 +1,21 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :issue do
     # Default to reporting users
   factory :issue do
     # Default to reporting users

-    association :reportable, :factory => :user
-    association :reported_user, :factory => :user
+    reportable :factory => :user
+    reported_user :factory => :user
+
+    # Default to assigning to an administrator
+    assigned_role { "administrator" }
+
+    # Optionally create some reports for this issue
+    factory :issue_with_reports do
+      transient do
+        reports_count { 1 }
+      end
+
+      after(:create) do |issue, evaluator|
+        create_list(:report, evaluator.reports_count, :issue => issue)
+      end
+    end

   end
 end
   end
 end