diff options
| author | Stan Hu <stan@gitlab.com> | 2018-01-04 05:42:52 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-16 17:04:38 -0800 |
| commit | 1f96512ba189d1eceb01353ca41c1cb6216d32c1 (patch) | |
| tree | e838b79b23e24ef042dc189a2112ac7ec10a8190 /spec/features | |
| parent | 8f4b06137577f868ffaa41d10c27aa1e763bc825 (diff) | |
| download | gitlab-ce-1f96512ba189d1eceb01353ca41c1cb6216d32c1.tar.gz | |
Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'
Validate project path in Gitlab import - 10.3 port
See merge request gitlab/gitlabhq!2268
(cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e)
2b94a7c2 Validate project path in Gitlab import
Diffstat (limited to 'spec/features')
| -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 af125e1b9d3..e8bb9c6a86c 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -32,7 +32,7 @@ feature 'Import/Export - project import integration test', :js do expect(page).to have_content('Import an exported GitLab project') expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=#{project_path}") - expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\h*\z/).and_call_original + expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}\z/).and_call_original attach_file('file', file) click_on 'Import project' |