Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 0 deletions

diff --git a/spec/factories/terraform/state.rb b/spec/factories/terraform/state.rb
index 94769290ac5..9decc89ef39 100644
--- a/spec/factories/terraform/state.rb
+++ b/spec/factories/terraform/state.rb
@@ -7,6 +7,7 @@ FactoryBot.define do
     sequence(:name) { |n| "state-#{n}" }
 
     trait :with_file do
+      versioning_enabled { false }
       file { fixture_file_upload('spec/fixtures/terraform/terraform.tfstate', 'application/json') }
     end
 
@@ -25,5 +26,14 @@ FactoryBot.define do
       with_file
       verification_failure { 'Could not calculate the checksum' }
     end
+
+    trait :with_version do
+      after(:create) do |state|
+        create(:terraform_state_version, :with_file, terraform_state: state)
+      end
+    end
+
+    # Remove with https://gitlab.com/gitlab-org/gitlab/-/issues/235108
+    factory :legacy_terraform_state, parent: :terraform_state, traits: [:with_file]
   end
 end
diff --git a/spec/factories/terraform/state_version.rb b/spec/factories/terraform/state_version.rb
new file mode 100644
index 00000000000..d1bd78215e3
--- /dev/null
+++ b/spec/factories/terraform/state_version.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :terraform_state_version, class: 'Terraform::StateVersion' do
+    terraform_state factory: :terraform_state
+    created_by_user factory: :user
+
+    sequence(:version)
+    file { fixture_file_upload('spec/fixtures/terraform/terraform.tfstate', 'application/json') }
+  end
+end