From 306dff0840e79ba962288738abeb7802b10e0f01 Mon Sep 17 00:00:00 2001
From: Alishan Ladhani <aladhani@gitlab.com>
Date: Mon, 19 Oct 2020 15:47:31 -0400
Subject: [PATCH] Fix FactoryBot/InlineAssociation for serverless & terraform

---
 .rubocop_todo.yml                                           | 3 ---
 .../geo/terraform_state_version_replicator_spec.rb          | 2 +-
 spec/factories/serverless/domain.rb                         | 4 ++--
 spec/factories/serverless/domain_cluster.rb                 | 6 +++---
 spec/factories/terraform/state.rb                           | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 996fe9ed5eb036..1f4935f5a35b3f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1337,8 +1337,5 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/resource_milestone_event.rb'
     - 'spec/factories/resource_state_event.rb'
     - 'spec/factories/sent_notifications.rb'
-    - 'spec/factories/serverless/domain.rb'
-    - 'spec/factories/serverless/domain_cluster.rb'
-    - 'spec/factories/terraform/state.rb'
     - 'spec/factories/uploads.rb'
     - 'spec/factories/wiki_pages.rb'
diff --git a/ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb b/ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb
index 5a9b4a9802834e..3281deb7398502 100644
--- a/ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb
+++ b/ee/spec/replicators/geo/terraform_state_version_replicator_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Geo::TerraformStateVersionReplicator do
-  let(:model_record) { build(:terraform_state_version) }
+  let(:model_record) { build(:terraform_state_version, terraform_state: create(:terraform_state)) }
 
   it_behaves_like 'a blob replicator'
 end
diff --git a/spec/factories/serverless/domain.rb b/spec/factories/serverless/domain.rb
index 7a6a048fb34668..c09af068d19a8e 100644
--- a/spec/factories/serverless/domain.rb
+++ b/spec/factories/serverless/domain.rb
@@ -3,8 +3,8 @@
 FactoryBot.define do
   factory :serverless_domain, class: '::Serverless::Domain' do
     function_name { 'test-function' }
-    serverless_domain_cluster { create(:serverless_domain_cluster) }
-    environment { create(:environment) }
+    serverless_domain_cluster { association(:serverless_domain_cluster) }
+    environment { association(:environment) }
 
     skip_create
   end
diff --git a/spec/factories/serverless/domain_cluster.rb b/spec/factories/serverless/domain_cluster.rb
index 40e0ecad5ade3d..e8ff6cf42b2acb 100644
--- a/spec/factories/serverless/domain_cluster.rb
+++ b/spec/factories/serverless/domain_cluster.rb
@@ -2,9 +2,9 @@
 
 FactoryBot.define do
   factory :serverless_domain_cluster, class: '::Serverless::DomainCluster' do
-    pages_domain { create(:pages_domain) }
-    knative { create(:clusters_applications_knative) }
-    creator { create(:user) }
+    pages_domain { association(:pages_domain) }
+    knative { association(:clusters_applications_knative) }
+    creator { association(:user) }
 
     certificate do
       File.read(Rails.root.join('spec/fixtures/', 'ssl_certificate.pem'))
diff --git a/spec/factories/terraform/state.rb b/spec/factories/terraform/state.rb
index d80c1315e28c0c..e5cea9e252e3f0 100644
--- a/spec/factories/terraform/state.rb
+++ b/spec/factories/terraform/state.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :terraform_state, class: 'Terraform::State' do
-    project { create(:project) }
+    project { association(:project) }
 
     sequence(:name) { |n| "state-#{n}" }
 
@@ -14,7 +14,7 @@
     trait :locked do
       sequence(:lock_xid) { |n| "lock-#{n}" }
       locked_at { Time.current }
-      locked_by_user { create(:user) }
+      locked_by_user { association(:user) }
     end
 
     trait :with_version do
-- 
GitLab