diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-08 15:10:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-08 15:10:00 +0000 |
commit | 0ebbf19f2d2b87e1f2aca1c59efde1aa6a766cf6 (patch) | |
tree | b45534e86659ab6fa97c240563651b2e03dfce4d /spec/lib/system_check | |
parent | ccc2dc45a3e8fab3dfeda097be601b16c5beff13 (diff) | |
download | gitlab-ce-0ebbf19f2d2b87e1f2aca1c59efde1aa6a766cf6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/system_check')
5 files changed, 5 insertions, 22 deletions
diff --git a/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb b/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb index 14bf9d61ab5..4536618ba61 100644 --- a/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb +++ b/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb @@ -1,13 +1,8 @@ # frozen_string_literal: true require 'spec_helper' -require 'rake_helper' - -RSpec.describe SystemCheck::App::HashedStorageAllProjectsCheck do - before do - silence_output - end +RSpec.describe SystemCheck::App::HashedStorageAllProjectsCheck, :silence_stdout do describe '#check?' do it 'fails when at least one project is in legacy storage' do create(:project, :legacy_storage) diff --git a/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb b/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb index 32a2f409858..36c6f0a2be1 100644 --- a/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb +++ b/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb @@ -1,13 +1,8 @@ # frozen_string_literal: true require 'spec_helper' -require 'rake_helper' - -RSpec.describe SystemCheck::App::HashedStorageEnabledCheck do - before do - silence_output - end +RSpec.describe SystemCheck::App::HashedStorageEnabledCheck, :silence_stdout do describe '#check?' do it 'fails when hashed storage is disabled' do stub_application_setting(hashed_storage_enabled: false) diff --git a/spec/lib/system_check/orphans/namespace_check_spec.rb b/spec/lib/system_check/orphans/namespace_check_spec.rb index 795dfde9029..e764c2313cd 100644 --- a/spec/lib/system_check/orphans/namespace_check_spec.rb +++ b/spec/lib/system_check/orphans/namespace_check_spec.rb @@ -1,15 +1,13 @@ # frozen_string_literal: true require 'spec_helper' -require 'rake_helper' -RSpec.describe SystemCheck::Orphans::NamespaceCheck do +RSpec.describe SystemCheck::Orphans::NamespaceCheck, :silence_stdout do let(:storages) { Gitlab.config.repositories.storages.reject { |key, _| key.eql? 'broken' } } before do allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) allow(subject).to receive(:fetch_disk_namespaces).and_return(disk_namespaces) - silence_output end describe '#multi_check' do diff --git a/spec/lib/system_check/orphans/repository_check_spec.rb b/spec/lib/system_check/orphans/repository_check_spec.rb index 2ab30f4802d..91b48969cc1 100644 --- a/spec/lib/system_check/orphans/repository_check_spec.rb +++ b/spec/lib/system_check/orphans/repository_check_spec.rb @@ -1,16 +1,14 @@ # frozen_string_literal: true require 'spec_helper' -require 'rake_helper' -RSpec.describe SystemCheck::Orphans::RepositoryCheck do +RSpec.describe SystemCheck::Orphans::RepositoryCheck, :silence_stdout do let(:storages) { Gitlab.config.repositories.storages.reject { |key, _| key.eql? 'broken' } } before do allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) allow(subject).to receive(:fetch_disk_namespaces).and_return(disk_namespaces) allow(subject).to receive(:fetch_disk_repositories).and_return(disk_repositories) - # silence_output end describe '#multi_check' do diff --git a/spec/lib/system_check/simple_executor_spec.rb b/spec/lib/system_check/simple_executor_spec.rb index c9a09d86e32..96d93146d5e 100644 --- a/spec/lib/system_check/simple_executor_spec.rb +++ b/spec/lib/system_check/simple_executor_spec.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true require 'spec_helper' -require 'rake_helper' -RSpec.describe SystemCheck::SimpleExecutor do +RSpec.describe SystemCheck::SimpleExecutor, :silence_stdout do before do stub_const('SimpleCheck', Class.new(SystemCheck::BaseCheck)) stub_const('OtherCheck', Class.new(SystemCheck::BaseCheck)) @@ -154,8 +153,6 @@ RSpec.describe SystemCheck::SimpleExecutor do describe '#execute' do before do - silence_output - subject << SimpleCheck subject << OtherCheck end |