Skip to content
Snippets Groups Projects
Unverified Commit d8dfec0f authored by James Lopez's avatar James Lopez
Browse files

Fix project import API after import service refactor

parent 46d59a5d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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?
Loading
Loading
Loading
Loading
@@ -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)
 
Loading
Loading
@@ -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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment