diff options
6 files changed, 13 insertions, 7 deletions
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml index 1e7a65715b0..d0ef7a534e6 100644 --- a/app/views/import/gitlab_projects/new.html.haml +++ b/app/views/import/gitlab_projects/new.html.haml @@ -7,10 +7,14 @@ = form_tag import_gitlab_project_path, class: 'form-horizontal', multipart: true do %p - Project will be imported to path #{@path} + Project will be imported to path + %strong + #{@path} %p - To get started add your exported project file below: + To get started add your exported project file below, then you will be redirected to the new project page and the project will appear once the import is done. + %p + You can generate a new export file from your project settings. .form-group = hidden_field_tag :namespace_id, @namespace_id = hidden_field_tag :path, @path diff --git a/app/views/notify/project_was_exported_email.html.haml b/app/views/notify/project_was_exported_email.html.haml index fb6f4ac3efc..b28fea35ad5 100644 --- a/app/views/notify/project_was_exported_email.html.haml +++ b/app/views/notify/project_was_exported_email.html.haml @@ -1,5 +1,5 @@ %p - Project #{@project.name} was exported succesfully + Project #{@project.name} was exported successfully. %p The project export can be downloaded from: = link_to download_export_namespace_project_url(@project.namespace, @project) do diff --git a/app/views/notify/project_was_exported_email.text.erb b/app/views/notify/project_was_exported_email.text.erb index fcd801c237c..42c4d176876 100644 --- a/app/views/notify/project_was_exported_email.text.erb +++ b/app/views/notify/project_was_exported_email.text.erb @@ -1,4 +1,4 @@ -Project <%= @project.name %> was exported succesfully +Project <%= @project.name %> was exported successfully. The project export can be downloaded from: <%= download_export_namespace_project_url(@project.namespace, @project) %> diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 03298149b60..816bef65ace 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -39,10 +39,11 @@ feature 'project import', feature: true, js: true do expect(project.merge_requests).not_to be_empty expect(project.repo_exists?).to be true expect(wiki_exists?).to be true + expect(project.import_status).to eq('finished') end def wiki_exists? wiki = ProjectWiki.new(project) - File.exists?(wiki.repository.path_to_repo) && !wiki.repository.empty? + File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty? end end diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index bc7993b9d75..7a40a43f8ae 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -6,7 +6,8 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do let(:user) { create(:user) } let(:namespace) { create(:namespace, owner: user) } let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') } - let(:project_tree_restorer) { described_class.new(user: user, shared: shared, namespace_id: namespace.id) } + let(:project) { create(:empty_project, name: 'project', path: 'project') } + let(:project_tree_restorer) { described_class.new(user: user, shared: shared, project: project) } let(:restored_project_json) { project_tree_restorer.restore } before do diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb index 6e6adfd60eb..f2d8e5595d6 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb @@ -30,7 +30,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do end it 'saves the correct json' do - expect(saved_project_json).to include({ "name" => project.name }) + expect(saved_project_json).to include({ "visibility_level" => 20 }) end it 'has events' do |