diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-08 14:32:45 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-08 14:32:45 +0900 |
| commit | 632b87a80e4e349ffc5fde585e661f51d6bec7e4 (patch) | |
| tree | 12d463ffedcf000a112d741a0a3f5598ede48e8f /spec/features/projects/import_export/import_file_spec.rb | |
| parent | 07d1d8bd6730015e65bd5123f305bf35b4839237 (diff) | |
| parent | 0eb74426b3eeacf92cd144e6ddc336adbe43ca1e (diff) | |
| download | gitlab-ce-632b87a80e4e349ffc5fde585e661f51d6bec7e4.tar.gz | |
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to 'spec/features/projects/import_export/import_file_spec.rb')
| -rw-r--r-- | spec/features/projects/import_export/import_file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index b25f5161748..60fe30bd898 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -46,7 +46,7 @@ feature 'Import/Export - project import integration test', :js do expect(project.merge_requests).not_to be_empty expect(project_hook_exists?(project)).to be true expect(wiki_exists?(project)).to be true - expect(project.import_status).to eq('finished') + expect(project.import_state.status).to eq('finished') end end |