Add latest changes from gitlab-org/gitlab@master

2 files changed, 48 insertions, 0 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
new file mode 100644
index 00000000000..e5e7f6a4450
--- /dev/null
+++ b/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rake_helper'
+
+describe SystemCheck::App::HashedStorageAllProjectsCheck do
+  before do
+    silence_output
+  end
+
+  describe '#check?' do
+    it 'fails when at least one project is in legacy storage' do
+      create(:project, :legacy_storage)
+
+      expect(subject.check?).to be_falsey
+    end
+
+    it 'succeeds when all projects are in hashed storage' do
+      create(:project)
+
+      expect(subject.check?).to be_truthy
+    end
+  end
+end
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
new file mode 100644
index 00000000000..d5a0014b791
--- /dev/null
+++ b/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rake_helper'
+
+describe SystemCheck::App::HashedStorageEnabledCheck do
+  before do
+    silence_output
+  end
+
+  describe '#check?' do
+    it 'fails when hashed storage is disabled' do
+      stub_application_setting(hashed_storage_enabled: false)
+
+      expect(subject.check?).to be_falsey
+    end
+
+    it 'succeeds when hashed storage is enabled' do
+      stub_application_setting(hashed_storage_enabled: true)
+
+      expect(subject.check?).to be_truthy
+    end
+  end
+end