Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 15 insertions, 0 deletions

diff --git a/spec/models/terraform/state_spec.rb b/spec/models/terraform/state_spec.rb
index a484952bfe9..533e6e4bd7b 100644
--- a/spec/models/terraform/state_spec.rb
+++ b/spec/models/terraform/state_spec.rb
@@ -10,6 +10,12 @@ RSpec.describe Terraform::State do
 
   it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_presence_of(:project_id) }
+  it { is_expected.to validate_presence_of(:uuid) }
+
+  describe 'default values' do
+    it { expect(described_class.new.uuid).to be_present }
+    it { expect(described_class.new(uuid: 'test').uuid).to eq('test') }
+  end
 
   describe 'scopes' do
     describe '.ordered_by_name' do
diff --git a/spec/models/terraform/state_version_spec.rb b/spec/models/terraform/state_version_spec.rb
index 22b1397f30a..477041117cb 100644
--- a/spec/models/terraform/state_version_spec.rb
+++ b/spec/models/terraform/state_version_spec.rb
@@ -10,6 +10,15 @@ RSpec.describe Terraform::StateVersion do
   it { is_expected.to belong_to(:created_by_user).class_name('User').optional }
   it { is_expected.to belong_to(:build).class_name('Ci::Build').optional }
 
+  describe 'default attributes' do
+    before do
+      allow(Terraform::StateUploader).to receive(:default_store).and_return(5)
+    end
+
+    it { expect(described_class.new.file_store).to eq(5) }
+    it { expect(described_class.new(file_store: 3).file_store).to eq(3) }
+  end
+
   describe 'scopes' do
     describe '.ordered_by_version_desc' do
       let(:terraform_state) { create(:terraform_state) }