1 files changed, 39 insertions, 19 deletions
diff --git a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
index b2603e099e6..03d1c125e36 100644
--- a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
+++ b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
@@ -58,35 +58,55 @@ RSpec.describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
       end
     end
 
-    context 'when not running puma with multiple threads' do
-      before do
-        allow(subject).to receive(:running_puma_with_multiple_threads?).and_return(false)
+    context 'when skip_rugged_auto_detect feature flag is enabled' do
+      context 'when not running puma with multiple threads' do
+        before do
+          allow(subject).to receive(:running_puma_with_multiple_threads?).and_return(false)
+          stub_feature_flags(feature_flag_name => nil)
+          stub_feature_flags(skip_rugged_auto_detect: true)
+        end
+
+        it 'returns false' do
+          expect(subject.use_rugged?(repository, feature_flag_name)).to be false
+        end
       end
+    end
 
-      it 'returns true when gitaly matches disk' do
-        expect(subject.use_rugged?(repository, feature_flag_name)).to be true
+    context 'when skip_rugged_auto_detect feature flag is disabled' do
+      before do
+        stub_feature_flags(skip_rugged_auto_detect: false)
       end
 
-      it 'returns false when disk access fails' do
-        allow(Gitlab::GitalyClient).to receive(:storage_metadata_file_path).and_return("/fake/path/doesnt/exist")
+      context 'when not running puma with multiple threads' do
+        before do
+          allow(subject).to receive(:running_puma_with_multiple_threads?).and_return(false)
+        end
 
-        expect(subject.use_rugged?(repository, feature_flag_name)).to be false
-      end
+        it 'returns true when gitaly matches disk' do
+          expect(subject.use_rugged?(repository, feature_flag_name)).to be true
+        end
 
-      it "returns false when gitaly doesn't match disk" do
-        allow(Gitlab::GitalyClient).to receive(:storage_metadata_file_path).and_return(temp_gitaly_metadata_file)
+        it 'returns false when disk access fails' do
+          allow(Gitlab::GitalyClient).to receive(:storage_metadata_file_path).and_return("/fake/path/doesnt/exist")
 
-        expect(subject.use_rugged?(repository, feature_flag_name)).to be_falsey
+          expect(subject.use_rugged?(repository, feature_flag_name)).to be false
+        end
 
-        File.delete(temp_gitaly_metadata_file)
-      end
+        it "returns false when gitaly doesn't match disk" do
+          allow(Gitlab::GitalyClient).to receive(:storage_metadata_file_path).and_return(temp_gitaly_metadata_file)
+
+          expect(subject.use_rugged?(repository, feature_flag_name)).to be_falsey
 
-      it "doesn't lead to a second rpc call because gitaly client should use the cached value" do
-        expect(subject.use_rugged?(repository, feature_flag_name)).to be true
+          File.delete(temp_gitaly_metadata_file)
+        end
 
-        expect(Gitlab::GitalyClient).not_to receive(:filesystem_id)
+        it "doesn't lead to a second rpc call because gitaly client should use the cached value" do
+          expect(subject.use_rugged?(repository, feature_flag_name)).to be true
 
-        subject.use_rugged?(repository, feature_flag_name)
+          expect(Gitlab::GitalyClient).not_to receive(:filesystem_id)
+
+          subject.use_rugged?(repository, feature_flag_name)
+        end
       end
     end
   end
@@ -165,7 +185,7 @@ RSpec.describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
     context 'all features are enabled' do
       let(:feature_keys) { [:feature_key_1, :feature_key_2] }
 
-      it { is_expected.to be_truthy}
+      it { is_expected.to be_truthy }
     end
 
     context 'all features are not enabled' do