diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 19:40:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 19:40:33 +0000 |
commit | d7c5be92af9c10cf20e78363c188c1a707a6bb90 (patch) | |
tree | df2d354bc4277c7a0324fb8240bd4e24d58007f2 /spec/lib | |
parent | b28d1361dd1ec63053dbfae475097928c6d01116 (diff) | |
download | gitlab-ce-d7c5be92af9c10cf20e78363c188c1a707a6bb90.tar.gz |
Add latest changes from gitlab-org/gitlab@15-6-stable-ee
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/fips_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/memory/watchdog/configurator_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb b/spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb index 9b0cb96b30b..5059ad620aa 100644 --- a/spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb +++ b/spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb @@ -103,7 +103,7 @@ RSpec.describe Gitlab::BackgroundMigration::DestroyInvalidMembers, :migration, s members = create_members member_data = members.map do |m| - { id: m.id, source_id: m.source_id, source_type: m.source_type } + { id: m.id, source_id: m.source_id, source_type: m.source_type, access_level: m.access_level } end expect(Gitlab::AppLogger).to receive(:info).with({ message: 'Removing invalid member records', diff --git a/spec/lib/gitlab/fips_spec.rb b/spec/lib/gitlab/fips_spec.rb index 4d19a44f617..50ab2889ccf 100644 --- a/spec/lib/gitlab/fips_spec.rb +++ b/spec/lib/gitlab/fips_spec.rb @@ -10,7 +10,7 @@ RSpec.describe Gitlab::FIPS do let(:fips_mode_env_var) { nil } before do - expect(OpenSSL).to receive(:fips_mode).and_return(openssl_fips_mode) + allow(OpenSSL).to receive(:fips_mode).and_return(openssl_fips_mode) stub_env("FIPS_MODE", fips_mode_env_var) end diff --git a/spec/lib/gitlab/memory/watchdog/configurator_spec.rb b/spec/lib/gitlab/memory/watchdog/configurator_spec.rb index e6f2d57e9e6..86cbb724cfd 100644 --- a/spec/lib/gitlab/memory/watchdog/configurator_spec.rb +++ b/spec/lib/gitlab/memory/watchdog/configurator_spec.rb @@ -165,7 +165,7 @@ RSpec.describe Gitlab::Memory::Watchdog::Configurator do end context 'when settings are set via environment variables' do - let(:memory_limit) { 1300 } + let(:memory_limit) { 1300.megabytes } let(:max_strikes) { 4 } before do @@ -177,7 +177,7 @@ RSpec.describe Gitlab::Memory::Watchdog::Configurator do end context 'when settings are not set via environment variables' do - let(:memory_limit) { 1200 } + let(:memory_limit) { 1200.megabytes } let(:max_strikes) { 5 } it_behaves_like 'as monitor configurator' |