From 561a6e475094a94214652da09c9cbf4422b42eb7 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Fri, 23 Oct 2020 18:21:01 +0200
Subject: [PATCH] Fix cop FactoryBot/InlineAssociation for EE resource events

---
 .rubocop_todo.yml                             | 2 --
 ee/spec/factories/resource_iteration_event.rb | 4 ++--
 ee/spec/factories/resource_weight_events.rb   | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ba31ea5704ea02..cd88bb8e32934f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1265,8 +1265,6 @@ FactoryBot/InlineAssociation:
     - 'ee/spec/factories/geo/event_log.rb'
     - 'ee/spec/factories/groups.rb'
     - 'ee/spec/factories/merge_request_blocks.rb'
-    - 'ee/spec/factories/resource_iteration_event.rb'
-    - 'ee/spec/factories/resource_weight_events.rb'
     - 'ee/spec/factories/vulnerabilities/feedback.rb'
     - 'spec/factories/atlassian_identities.rb'
     - 'spec/factories/design_management/design_at_version.rb'
diff --git a/ee/spec/factories/resource_iteration_event.rb b/ee/spec/factories/resource_iteration_event.rb
index 85e7320f7a7184..fb456ed3fd6564 100644
--- a/ee/spec/factories/resource_iteration_event.rb
+++ b/ee/spec/factories/resource_iteration_event.rb
@@ -2,10 +2,10 @@
 
 FactoryBot.define do
   factory :resource_iteration_event do
-    issue { merge_request.nil? ? create(:issue) : nil }
+    issue { merge_request.nil? ? association(:issue) : nil }
     merge_request { nil }
     iteration
     action { :add }
-    user { issue&.author || merge_request&.author || create(:user) }
+    user { issue&.author || merge_request&.author || association(:user) }
   end
 end
diff --git a/ee/spec/factories/resource_weight_events.rb b/ee/spec/factories/resource_weight_events.rb
index cb9a34df332e10..33a2cf1f2a82e3 100644
--- a/ee/spec/factories/resource_weight_events.rb
+++ b/ee/spec/factories/resource_weight_events.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :resource_weight_event do
-    issue { create(:issue) }
-    user { issue&.author || create(:user) }
+    issue { association(:issue) }
+    user { issue&.author || association(:user) }
   end
 end
-- 
GitLab