Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

2 files changed, 0 insertions, 44 deletions

diff --git a/spec/lib/object_storage/config_spec.rb b/spec/lib/object_storage/config_spec.rb
index 21b8a44b3d6..9a0e83bfd5e 100644
--- a/spec/lib/object_storage/config_spec.rb
+++ b/spec/lib/object_storage/config_spec.rb
@@ -36,46 +36,6 @@ RSpec.describe ObjectStorage::Config do
 
   subject { described_class.new(raw_config.as_json) }
 
-  describe '#load_provider' do
-    before do
-      subject.load_provider
-    end
-
-    context 'with AWS' do
-      it 'registers AWS as a provider' do
-        expect(Fog.providers.keys).to include(:aws)
-      end
-    end
-
-    context 'with Google' do
-      let(:credentials) do
-        {
-          provider: 'Google',
-          google_storage_access_key_id: 'GOOGLE_ACCESS_KEY_ID',
-          google_storage_secret_access_key: 'GOOGLE_SECRET_ACCESS_KEY'
-        }
-      end
-
-      it 'registers Google as a provider' do
-        expect(Fog.providers.keys).to include(:google)
-      end
-    end
-
-    context 'with Azure' do
-      let(:credentials) do
-        {
-          provider: 'AzureRM',
-          azure_storage_account_name: 'azuretest',
-          azure_storage_access_key: 'ABCD1234'
-        }
-      end
-
-      it 'registers AzureRM as a provider' do
-        expect(Fog.providers.keys).to include(:azurerm)
-      end
-    end
-  end
-
   describe '#credentials' do
     it { expect(subject.credentials).to eq(credentials) }
   end
diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index 006f4f603b6..1629aec89f5 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -201,10 +201,6 @@ RSpec.describe ObjectStorage::DirectUpload do
     end
 
     shared_examples 'a valid AzureRM upload' do
-      before do
-        require 'fog/azurerm'
-      end
-
       it_behaves_like 'a valid upload'
 
       it 'enables the Workhorse client' do