diff options
author | James Lopez <james@jameslopez.es> | 2018-02-14 16:46:40 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-02-14 16:46:40 +0300 |
commit | e613d777b258a4f7070d2b7aaee093901e4b7ed7 (patch) | |
tree | aaaefe41f510e09cdcaf4542973f505619b519ff /spec/requests/api/project_import_spec.rb | |
parent | 083194908437f129adcb6e36be40af72ad6d308c (diff) |
refactor code based on feedback
Diffstat (limited to 'spec/requests/api/project_import_spec.rb')
-rw-r--r-- | spec/requests/api/project_import_spec.rb | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb index 47c1edc7919..2fb103c6510 100644 --- a/spec/requests/api/project_import_spec.rb +++ b/spec/requests/api/project_import_spec.rb @@ -17,8 +17,7 @@ describe API::ProjectImport do describe 'POST /projects/import' do it 'schedules an import using a namespace' do - expect_any_instance_of(Project).to receive(:import_schedule) - expect(Gitlab::ImportExport::ProjectCreator).to receive(:new).with(namespace.id, any_args).and_call_original + stub_import(user.namespace) post api('/projects/import', user), path: 'test-import', file: fixture_file_upload(file), namespace: namespace.id @@ -26,8 +25,7 @@ describe API::ProjectImport do end it 'schedules an import using the namespace path' do - expect_any_instance_of(Project).to receive(:import_schedule) - expect(Gitlab::ImportExport::ProjectCreator).to receive(:new).with(namespace.id, any_args).and_call_original + stub_import(unamespace) post api('/projects/import', user), path: 'test-import', file: fixture_file_upload(file), namespace: namespace.full_path @@ -35,14 +33,23 @@ describe API::ProjectImport do end it 'schedules an import at the user namespace level' do - expect_any_instance_of(Project).to receive(:import_schedule) - expect(Gitlab::ImportExport::ProjectCreator).to receive(:new).with(user.namespace.id, any_args).and_call_original + stub_import(user.namespace) post api('/projects/import', user), path: 'test-import2', file: fixture_file_upload(file) expect(response).to have_gitlab_http_status(201) end + 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) + + post api('/projects/import', user), namespace: 'nonexistent', path: 'test-import2', file: fixture_file_upload(file) + + expect(response).to have_gitlab_http_status(404) + expect(json_response['message']).to eq('404 Namespace Not Found') + end + it 'does not schedule an import if the user has no permission to the namespace' do expect_any_instance_of(Project).not_to receive(:import_schedule) @@ -51,8 +58,8 @@ describe API::ProjectImport do file: fixture_file_upload(file), namespace: namespace.full_path) - expect(response).to have_gitlab_http_status(400) - expect(json_response['message']).to eq('Namespace is not valid') + expect(response).to have_gitlab_http_status(404) + expect(json_response['message']).to eq('404 Namespace Not Found') end it 'does not schedule an import if the user uploads no valid file' do @@ -63,6 +70,11 @@ describe API::ProjectImport do expect(response).to have_gitlab_http_status(400) expect(json_response['error']).to eq('file is invalid') end + + 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 + end end describe 'GET /projects/:id/import' do |