1 files changed, 5 insertions, 8 deletions
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index f1fd1fd7f73..998080a3dd5 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :issue do
     title { generate(:title) }
-    author
-    project factory: :empty_project
+    project
+    author { project.creator }
 
     trait :confidential do
       confidential true
@@ -14,14 +14,11 @@ FactoryGirl.define do
 
     trait :closed do
       state :closed
-    end
-
-    trait :reopened do
-      state :reopened
+      closed_at { Time.now }
     end
 
     factory :closed_issue, traits: [:closed]
-    factory :reopened_issue, traits: [:reopened]
+    factory :reopened_issue, traits: [:opened]
 
     factory :labeled_issue do
       transient do