diff options
Diffstat (limited to 'spec/support/helpers/stub_object_storage.rb')
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index 6056359d026..8a52a614821 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -1,13 +1,6 @@ # frozen_string_literal: true module StubObjectStorage - def stub_packages_object_storage(**params) - stub_object_storage_uploader(config: ::Gitlab.config.packages.object_store, - uploader: ::Packages::PackageFileUploader, - remote_directory: 'packages', - **params) - end - def stub_dependency_proxy_object_storage(**params) stub_object_storage_uploader(config: ::Gitlab.config.dependency_proxy.object_store, uploader: ::DependencyProxy::FileUploader, @@ -44,7 +37,7 @@ module StubObjectStorage Fog.mock! ::Fog::Storage.new(connection_params).tap do |connection| - connection.directories.create(key: remote_directory) + connection.directories.create(key: remote_directory) # rubocop:disable Rails/SaveBang # Cleanup remaining files connection.directories.each do |directory| @@ -54,9 +47,9 @@ module StubObjectStorage end end - def stub_artifacts_object_storage(**params) + def stub_artifacts_object_storage(uploader = JobArtifactUploader, **params) stub_object_storage_uploader(config: Gitlab.config.artifacts.object_store, - uploader: JobArtifactUploader, + uploader: uploader, remote_directory: 'artifacts', **params) end |