diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-02 16:35:04 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-04 18:33:26 +0300 |
| commit | bddbcaefc2389e4c61763472cecbea150f10cd75 (patch) | |
| tree | 38ba599beed53505dfca09fce7a890bf3b125bb3 /spec/requests | |
| parent | 7603beffc916d06039cac63b223d8e6234b5d666 (diff) | |
Backports every CE related change from ee-44542 to CE
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/project_import_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb index f68057a92a1..f8c64f063af 100644 --- a/spec/requests/api/project_import_spec.rb +++ b/spec/requests/api/project_import_spec.rb @@ -145,7 +145,7 @@ describe API::ProjectImport do describe 'GET /projects/:id/import' do it 'returns the import status' do - project = create(:project, import_status: 'started') + project = create(:project, :import_started) project.add_master(user) get api("/projects/#{project.id}/import", user) @@ -155,8 +155,9 @@ describe API::ProjectImport do end it 'returns the import status and the error if failed' do - project = create(:project, import_status: 'failed', import_error: 'error') + project = create(:project, :import_failed) project.add_master(user) + project.import_state.update_attributes(last_error: 'error') get api("/projects/#{project.id}/import", user) |