diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 03:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 03:08:36 +0300 |
commit | 15e5a05bcd3525dd6c046dca2682b04532ba9bd1 (patch) | |
tree | d7336c9eab9716f541eb9548d51d4c59ff34aa3c /spec/uploaders | |
parent | 3d911c6c1f34df47036f1d7e0838e4d5876ee923 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/object_storage/cdn_spec.rb | 2 | ||||
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/uploaders/object_storage/cdn_spec.rb b/spec/uploaders/object_storage/cdn_spec.rb index 0c1966b4df2..28b3313428b 100644 --- a/spec/uploaders/object_storage/cdn_spec.rb +++ b/spec/uploaders/object_storage/cdn_spec.rb @@ -41,7 +41,7 @@ RSpec.describe ObjectStorage::CDN, feature_category: :build_artifacts do before do stub_artifacts_object_storage(enabled: true) - options = Settingslogic.new(Gitlab.config.uploads.deep_merge(cdn_options)) + options = Gitlab.config.uploads.deep_merge(cdn_options) allow(uploader_class).to receive(:options).and_return(options) end diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index 0e293ec973c..ef46803fc56 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -446,7 +446,7 @@ RSpec.describe ObjectStorage do end describe '#fog_credentials' do - let(:connection) { Settingslogic.new("provider" => "AWS") } + let(:connection) { GitlabSettings::Options.build("provider" => "AWS") } before do allow(uploader_class).to receive(:options) do @@ -479,7 +479,7 @@ RSpec.describe ObjectStorage do } end - let(:options) { Settingslogic.new(raw_options) } + let(:options) { GitlabSettings::Options.build(raw_options) } before do allow(uploader_class).to receive(:options) do |