Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/lib/bulk_imports/clients/http_spec.rb b/spec/lib/bulk_imports/clients/http_spec.rb
index 75c5f363b1f..6962a943755 100644
--- a/spec/lib/bulk_imports/clients/http_spec.rb
+++ b/spec/lib/bulk_imports/clients/http_spec.rb
@@ -202,6 +202,22 @@ RSpec.describe BulkImports::Clients::HTTP do
     it 'returns version as an instance of Gitlab::VersionInfo' do
       expect(subject.instance_version).to eq(Gitlab::VersionInfo.parse(version))
     end
+
+    context 'when /version endpoint is not available' do
+      it 'requests /metadata endpoint' do
+        response_double = double(code: 404, success?: false, parsed_response: 'Not Found', request: double(path: double(path: '/version')))
+
+        allow(Gitlab::HTTP).to receive(:get)
+          .with('http://gitlab.example/api/v4/version', anything)
+          .and_return(response_double)
+
+        expect(Gitlab::HTTP).to receive(:get)
+          .with('http://gitlab.example/api/v4/metadata', anything)
+          .and_return(version_response)
+
+        expect(subject.instance_version).to eq(Gitlab::VersionInfo.parse(version))
+      end
+    end
   end
 
   describe '#compatible_for_project_migration?' do