Add latest changes from gitlab-org/gitlab@16-5-stable-ee

2 files changed, 11 insertions, 37 deletions

diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index aa7120e482a..64e010aa50f 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1400,14 +1400,13 @@ RSpec.describe API::Projects, :aggregate_failures, feature_category: :groups_and
     it 'disallows creating a project with an import_url that is not reachable' do
       url = 'http://example.com'
       endpoint_url = "#{url}/info/refs?service=git-upload-pack"
-      error_response = { status: 301, body: '', headers: nil }
-      stub_full_request(endpoint_url, method: :get).to_return(error_response)
+      stub_full_request(endpoint_url, method: :get).to_return({ status: 301, body: '', headers: nil })
       project_params = { import_url: url, path: 'path-project-Foo', name: 'Foo Project' }
 
       expect { post api(path, user), params: project_params }.not_to change { Project.count }
 
       expect(response).to have_gitlab_http_status(:unprocessable_entity)
-      expect(json_response['message']).to eq("#{url} endpoint error: #{error_response[:status]}")
+      expect(json_response['message']).to eq("#{url} is not a valid HTTP Git repository")
     end
 
     it 'creates a project with an import_url that is valid' do
diff --git a/spec/services/import/validate_remote_git_endpoint_service_spec.rb b/spec/services/import/validate_remote_git_endpoint_service_spec.rb
index 15e80f2c85d..1d2b3975832 100644
--- a/spec/services/import/validate_remote_git_endpoint_service_spec.rb
+++ b/spec/services/import/validate_remote_git_endpoint_service_spec.rb
@@ -7,9 +7,7 @@ RSpec.describe Import::ValidateRemoteGitEndpointService, feature_category: :impo
 
   let_it_be(:base_url) { 'http://demo.host/path' }
   let_it_be(:endpoint_url) { "#{base_url}/info/refs?service=git-upload-pack" }
-  let_it_be(:endpoint_error_message) { "#{base_url} endpoint error:" }
-  let_it_be(:body_error_message) { described_class::INVALID_BODY_MESSAGE }
-  let_it_be(:content_type_error_message) { described_class::INVALID_CONTENT_TYPE_MESSAGE }
+  let_it_be(:error_message) { "#{base_url} is not a valid HTTP Git repository" }
 
   describe '#execute' do
     let(:valid_response) do
@@ -72,14 +70,13 @@ RSpec.describe Import::ValidateRemoteGitEndpointService, feature_category: :impo
       end
 
       it 'reports error when status code is not 200' do
-        error_response = { status: 401 }
-        stub_full_request(endpoint_url, method: :get).to_return(error_response)
+        stub_full_request(endpoint_url, method: :get).to_return(valid_response.merge({ status: 301 }))
 
         result = subject.execute
 
         expect(result).to be_a(ServiceResponse)
         expect(result.error?).to be(true)
-        expect(result.message).to eq("#{endpoint_error_message} #{error_response[:status]}")
+        expect(result.message).to eq(error_message)
       end
 
       it 'reports error when invalid URL is provided' do
@@ -97,49 +94,27 @@ RSpec.describe Import::ValidateRemoteGitEndpointService, feature_category: :impo
 
         expect(result).to be_a(ServiceResponse)
         expect(result.error?).to be(true)
-        expect(result.message).to eq(content_type_error_message)
-      end
-
-      it 'reports error when body is too short' do
-        stub_full_request(endpoint_url, method: :get).to_return(valid_response.merge({ body: 'invalid content' }))
-
-        result = subject.execute
-
-        expect(result).to be_a(ServiceResponse)
-        expect(result.error?).to be(true)
-        expect(result.message).to eq(body_error_message)
+        expect(result.message).to eq(error_message)
       end
 
       it 'reports error when body is in invalid format' do
-        stub_full_request(endpoint_url, method: :get).to_return(valid_response.merge({ body: 'invalid long content with no git respons whatshowever' }))
-
-        result = subject.execute
-
-        expect(result).to be_a(ServiceResponse)
-        expect(result.error?).to be(true)
-        expect(result.message).to eq(body_error_message)
-      end
-
-      it 'reports error when http exceptions are raised' do
-        err = SocketError.new('dummy message')
-        stub_full_request(endpoint_url, method: :get).to_raise(err)
+        stub_full_request(endpoint_url, method: :get).to_return(valid_response.merge({ body: 'invalid content' }))
 
         result = subject.execute
 
         expect(result).to be_a(ServiceResponse)
         expect(result.error?).to be(true)
-        expect(result.message).to eq("HTTP #{err.class.name.underscore} error: #{err.message}")
+        expect(result.message).to eq(error_message)
       end
 
-      it 'reports error when other exceptions are raised' do
-        err = StandardError.new('internal dummy message')
-        stub_full_request(endpoint_url, method: :get).to_raise(err)
+      it 'reports error when exception is raised' do
+        stub_full_request(endpoint_url, method: :get).to_raise(SocketError.new('dummy message'))
 
         result = subject.execute
 
         expect(result).to be_a(ServiceResponse)
         expect(result.error?).to be(true)
-        expect(result.message).to eq("Internal #{err.class.name.underscore} error: #{err.message}")
+        expect(result.message).to eq(error_message)
       end
     end