Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-09-04 19:17:37 +0300
committerJames Lopez <james@jameslopez.es>2017-09-04 19:17:37 +0300
commitaf374be863de648d89f1571f5c311ec9b761294d (patch)
tree79be3b828b5f77f8702f541797603f59165e59b9 /spec/features/projects/import_export
parent2065a2d1d9034169d42b06d331fe06b4772b6df4 (diff)
refactor spec
Diffstat (limited to 'spec/features/projects/import_export')
-rw-r--r--spec/features/projects/import_export/import_file_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 6d1caed61fd..bc6b6989a3b 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -18,7 +18,7 @@ feature 'Import/Export - project import integration test', js: true do
context 'when selecting the namespace' do
let(:user) { create(:admin) }
- let!(:namespace) { create(:namespace, name: "asd" + SecureRandom.hex, path: SecureRandom.hex, owner: user) }
+ let!(:namespace) { create(:namespace, name: 'asd', owner: user) }
let(:project_path) { 'test-project-path' + SecureRandom.hex }
context 'prefilled the path' do
@@ -31,7 +31,7 @@ feature 'Import/Export - project import integration test', js: true 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#{project_path}\z/).and_call_original
+ expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path.*\z/).and_call_original
attach_file('file', file)
click_on 'Import project'
@@ -66,7 +66,7 @@ feature 'Import/Export - project import integration test', js: true do
end
scenario 'invalid project' do
- namespace = create(:namespace, name: "asd" + SecureRandom.hex, owner: user)
+ namespace = create(:namespace, name: 'asdf', owner: user)
project = create(:project, namespace: namespace)
visit new_project_path