1 files changed, 17 insertions, 4 deletions
diff --git a/spec/factories/commits.rb b/spec/factories/commits.rb
index f4f12a095fc..84a8bc56640 100644
--- a/spec/factories/commits.rb
+++ b/spec/factories/commits.rb
@@ -1,16 +1,29 @@
 require_relative '../support/repo_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :commit do
-    git_commit RepoHelpers.sample_commit
+    transient do
+      author nil
+    end
+
+    git_commit do
+      commit = RepoHelpers.sample_commit
+
+      if author
+        commit.author_email = author.email
+        commit.author_name = author.name
+      end
+
+      commit
+    end
     project
 
     initialize_with do
       new(git_commit, project)
     end
 
-    after(:build) do |commit|
-      allow(commit).to receive(:author).and_return build(:author)
+    after(:build) do |commit, evaluator|
+      allow(commit).to receive(:author).and_return(evaluator.author || build(:author))
     end
 
     trait :without_author do