kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'master'

Browse source 
Resolve "spec/requests/api/project_import_spec.rb fails"

Closes #43345

See merge request gitlab-org/gitlab-ce!17184
This commit is contained in:
Sean McGivern 2018-02-16 17:34:23 +00:00
commit 71ba398263
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/api/project_import.rb
View file

@ -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?

4
spec/requests/api/project_import_spec.rb
View file

@ -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