diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
commit | 14bd84b61276ef29b97d23642d698de769bacfd2 (patch) | |
tree | f9eba90140c1bd874211dea17750a0d422c04080 /spec/lib/object_storage/config_spec.rb | |
parent | 891c388697b2db0d8ee0c8358a9bdbf6dc56d581 (diff) |
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42
Diffstat (limited to 'spec/lib/object_storage/config_spec.rb')
-rw-r--r-- | spec/lib/object_storage/config_spec.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/lib/object_storage/config_spec.rb b/spec/lib/object_storage/config_spec.rb index 2a81142ea44..412fcb9b6b8 100644 --- a/spec/lib/object_storage/config_spec.rb +++ b/spec/lib/object_storage/config_spec.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'fast_spec_helper' +require 'spec_helper' require 'rspec-parameterized' require 'fog/core' -RSpec.describe ObjectStorage::Config do +RSpec.describe ObjectStorage::Config, feature_category: :shared do using RSpec::Parameterized::TableSyntax let(:region) { 'us-east-1' } @@ -130,6 +130,11 @@ RSpec.describe ObjectStorage::Config do it { expect(subject.provider).to eq('AWS') } it { expect(subject.aws?).to be true } it { expect(subject.google?).to be false } + it { expect(subject.credentials).to eq(credentials) } + + context 'with FIPS enabled', :fips_mode do + it { expect(subject.credentials).to eq(credentials.merge(disable_content_md5_validation: true)) } + end end context 'with Google credentials' do |