diff options
Diffstat (limited to 'spec/support/helpers/stub_object_storage.rb')
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index 661c1c683b0..87e2a71b1cd 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -13,13 +13,16 @@ module StubObjectStorage enabled: true, proxy_download: false, background_upload: false, - direct_upload: false + direct_upload: false, + cdn: {} ) + new_config = config.to_h.deep_symbolize_keys.merge({ enabled: enabled, proxy_download: proxy_download, background_upload: background_upload, - direct_upload: direct_upload + direct_upload: direct_upload, + cdn: cdn }) # Needed for ObjectStorage::Config compatibility @@ -30,6 +33,10 @@ module StubObjectStorage allow(config).to receive(:background_upload) { background_upload } allow(config).to receive(:direct_upload) { direct_upload } + uploader_config = Settingslogic.new(new_config.deep_stringify_keys) + allow(uploader).to receive(:object_store_options).and_return(uploader_config) + allow(uploader.options).to receive(:object_store).and_return(uploader_config) + return unless enabled stub_object_storage(connection_params: uploader.object_store_credentials, @@ -74,6 +81,12 @@ module StubObjectStorage **params) end + def stub_rpm_repository_file_object_storage(**params) + stub_object_storage_uploader(config: Gitlab.config.packages.object_store, + uploader: ::Packages::Rpm::RepositoryFileUploader, + **params) + end + def stub_composer_cache_object_storage(**params) stub_object_storage_uploader(config: Gitlab.config.packages.object_store, uploader: ::Packages::Composer::CacheUploader, |