summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-02-13 09:24:10 +0100
committerJames Lopez <james@jameslopez.es>2018-02-13 15:25:48 +0100
commit583ed0eb94ff938b4986491e27af5f3c97ea6baf (patch)
tree0102e58fa8f4789af8e0d2ce3745ba9583492896 /spec
parent7ec1a022b79c68dd3232c0abf07d119f0dad808f (diff)
downloadgitlab-ce-583ed0eb94ff938b4986491e27af5f3c97ea6baf.tar.gz
add import status endpoint
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/project_import_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index 3c9a05f93ea..cbea0229b09 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -22,14 +22,13 @@ describe API::ProjectImport do
post api('/projects/import', user), path: 'test-import', file: fixture_file_upload(file), namespace: namespace.full_path
expect(response).to have_gitlab_http_status(201)
-
- expect(Project.find_by_name('test-import').first.status).to eq('started')
end
end
describe 'GET /projects/:id/import' do
it 'returns the import status' do
project = create(:project, import_status: 'started')
+ project.add_master(user)
get api("/projects/#{project.id}/import", user)
@@ -39,6 +38,7 @@ describe API::ProjectImport do
it 'returns the import status and the error if failed' do
project = create(:project, import_status: 'failed', import_error: 'error')
+ project.add_master(user)
get api("/projects/#{project.id}/import", user)