Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 5 insertions, 7 deletions

diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb
index 140595e58ad..71eff23c77c 100644
--- a/spec/uploaders/records_uploads_spec.rb
+++ b/spec/uploaders/records_uploads_spec.rb
@@ -78,8 +78,7 @@ describe RecordsUploads do
         path: File.join('uploads', 'rails_sample.jpg'),
         size: 512.kilobytes,
         model: build_stubbed(:user),
-        uploader: uploader.class.to_s,
-        store: ::ObjectStorage::Store::LOCAL
+        uploader: uploader.class.to_s
       )
 
       uploader.upload = existing
@@ -99,8 +98,7 @@ describe RecordsUploads do
         path: File.join('uploads', 'rails_sample.jpg'),
         size: 512.kilobytes,
         model: project,
-        uploader: uploader.class.to_s,
-        store: ::ObjectStorage::Store::LOCAL
+        uploader: uploader.class.to_s
       )
 
       uploader.store!(upload_fixture('rails_sample.jpg'))
diff --git a/spec/uploaders/terraform/state_uploader_spec.rb b/spec/uploaders/terraform/state_uploader_spec.rb
index 4577a2c4738..cbcb6298eca 100644
--- a/spec/uploaders/terraform/state_uploader_spec.rb
+++ b/spec/uploaders/terraform/state_uploader_spec.rb
@@ -5,15 +5,15 @@ require 'spec_helper'
 describe Terraform::StateUploader do
   subject { terraform_state.file }
 
-  let(:terraform_state) { create(:terraform_state, file: fixture_file_upload('spec/fixtures/terraform/terraform.tfstate')) }
+  let(:terraform_state) { create(:terraform_state, :with_file) }
 
   before do
     stub_terraform_state_object_storage
   end
 
   describe '#filename' do
-    it 'contains the ID of the terraform state record' do
-      expect(subject.filename).to include(terraform_state.id.to_s)
+    it 'contains the UUID of the terraform state record' do
+      expect(subject.filename).to include(terraform_state.uuid)
     end
   end