Merge branch 'jc-fix-auto-rugged-detection' into 'master'

Handle when server info doesn't have the storage in question

See merge request gitlab-org/gitlab-ce!32023

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb
index e9fb6c0125c..99d563e03ec 100644
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
@@ -27,6 +27,16 @@ describe Gitlab::GitalyClient do
     end
   end
 
+  describe '.filesystem_id' do
+    it 'returns an empty string when the storage is not found in the response' do
+      response = double("response")
+      allow(response).to receive(:storage_statuses).and_return([])
+      allow_any_instance_of(Gitlab::GitalyClient::ServerService).to receive(:info).and_return(response)
+
+      expect(described_class.filesystem_id('default')).to eq(nil)
+    end
+  end
+
   describe '.stub_class' do
     it 'returns the gRPC health check stub' do
       expect(described_class.stub_class(:health_check)).to eq(::Grpc::Health::V1::Health::Stub)