Fix project import API after import service refactor

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb
index c32e2f26ae3..a509c1f32c1 100644
--- a/lib/api/project_import.rb
+++ b/lib/api/project_import.rb
@@ -41,8 +41,12 @@ module API
                       current_user.namespace
                     end
 
-        project_params = import_params.merge(namespace_id: namespace.id,
-                                             file: import_params[:file]['tempfile'])
+        project_params = {
+            path: import_params[:path],
+            namespace_id: namespace.id,
+            file: import_params[:file]['tempfile']
+        }
+
         project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute
 
         render_api_error!(project.errors.full_messages&.first, 400) unless project.saved?
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index eabf9095c13..987f6e26971 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -42,7 +42,7 @@ describe API::ProjectImport do
 
     it 'schedules an import at the user namespace level' do
       expect_any_instance_of(Project).not_to receive(:import_schedule)
-      expect(Gitlab::ImportExport::ProjectCreator).not_to receive(:new)
+      expect(::Projects::CreateService).not_to receive(:new)
 
       post api('/projects/import', user), namespace: 'nonexistent', path: 'test-import2', file: fixture_file_upload(file)
 
@@ -73,7 +73,7 @@ describe API::ProjectImport do
 
     def stub_import(namespace)
       expect_any_instance_of(Project).to receive(:import_schedule)
-      expect(Gitlab::ImportExport::ProjectCreator).to receive(:new).with(namespace.id, any_args).and_call_original
+      expect(::Projects::CreateService).to receive(:new).with(user, hash_including(namespace_id: namespace.id)).and_call_original
     end
   end