Commit 2e411b5e authored by Adam Niedzielski's avatar Adam Niedzielski

Test GitLab project import for a user with only their default namespace.

Refactor the spec file:
- remove hardcoded record IDs
- avoid top-level let if not used in all scenarios
- prefer expect { ... }.to change { ... }.from(0).to(1) over checking
that there are no records at the beginning of the test
parent 2510345e
...@@ -3,13 +3,8 @@ require 'spec_helper' ...@@ -3,13 +3,8 @@ require 'spec_helper'
feature 'Import/Export - project import integration test', feature: true, js: true do feature 'Import/Export - project import integration test', feature: true, js: true do
include Select2Helper include Select2Helper
let(:admin) { create(:admin) }
let(:normal_user) { create(:user) }
let!(:namespace) { create(:namespace, name: "asd", owner: admin) }
let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') } let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
let(:export_path) { "#{Dir::tmpdir}/import_file_spec" } let(:export_path) { "#{Dir::tmpdir}/import_file_spec" }
let(:project) { Project.last }
let(:project_hook) { Gitlab::Git::Hook.new('post-receive', project.repository.path) }
background do background do
allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
...@@ -19,41 +14,43 @@ feature 'Import/Export - project import integration test', feature: true, js: tr ...@@ -19,41 +14,43 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
FileUtils.rm_rf(export_path, secure: true) FileUtils.rm_rf(export_path, secure: true)
end end
context 'admin user' do context 'when selecting the namespace' do
let(:user) { create(:admin) }
let!(:namespace) { create(:namespace, name: "asd", owner: user) }
before do before do
login_as(admin) login_as(user)
end end
scenario 'user imports an exported project successfully' do scenario 'user imports an exported project successfully' do
expect(Project.all.count).to be_zero
visit new_project_path visit new_project_path
select2('2', from: '#project_namespace_id') select2(namespace.id, from: '#project_namespace_id')
fill_in :project_path, with: 'test-project-path', visible: true fill_in :project_path, with: 'test-project-path', visible: true
click_link 'GitLab export' click_link 'GitLab export'
expect(page).to have_content('GitLab project export') expect(page).to have_content('GitLab project export')
expect(URI.parse(current_url).query).to eq('namespace_id=2&path=test-project-path') expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path")
attach_file('file', file) attach_file('file', file)
click_on 'Import project' # import starts expect { click_on 'Import project' }.to change { Project.count }.from(0).to(1)
project = Project.last
expect(project).not_to be_nil expect(project).not_to be_nil
expect(project.issues).not_to be_empty expect(project.issues).not_to be_empty
expect(project.merge_requests).not_to be_empty expect(project.merge_requests).not_to be_empty
expect(project_hook).to exist expect(project_hook_exists?(project)).to be true
expect(wiki_exists?).to be true expect(wiki_exists?(project)).to be true
expect(project.import_status).to eq('finished') expect(project.import_status).to eq('finished')
end end
scenario 'invalid project' do scenario 'invalid project' do
project = create(:project, namespace_id: 2) project = create(:project, namespace: namespace)
visit new_project_path visit new_project_path
select2('2', from: '#project_namespace_id') select2(namespace.id, from: '#project_namespace_id')
fill_in :project_path, with: project.name, visible: true fill_in :project_path, with: project.name, visible: true
click_link 'GitLab export' click_link 'GitLab export'
...@@ -66,11 +63,11 @@ feature 'Import/Export - project import integration test', feature: true, js: tr ...@@ -66,11 +63,11 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
end end
scenario 'project with no name' do scenario 'project with no name' do
create(:project, namespace_id: 2) create(:project, namespace: namespace)
visit new_project_path visit new_project_path
select2('2', from: '#project_namespace_id') select2(namespace.id, from: '#project_namespace_id')
# click on disabled element # click on disabled element
find(:link, 'GitLab export').trigger('click') find(:link, 'GitLab export').trigger('click')
...@@ -81,24 +78,30 @@ feature 'Import/Export - project import integration test', feature: true, js: tr ...@@ -81,24 +78,30 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
end end
end end
context 'normal user' do context 'when limited to the default user namespace' do
let(:user) { create(:user) }
before do before do
login_as(normal_user) login_as(user)
end end
scenario 'non-admin user is allowed to import a project' do scenario 'passes correct namespace ID in the URL' do
expect(Project.all.count).to be_zero
visit new_project_path visit new_project_path
fill_in :project_path, with: 'test-project-path', visible: true fill_in :project_path, with: 'test-project-path', visible: true
expect(page).to have_content('GitLab export') click_link 'GitLab export'
expect(page).to have_content('GitLab project export')
expect(URI.parse(current_url).query).to eq("namespace_id=#{user.namespace.id}&path=test-project-path")
end end
end end
def wiki_exists? def wiki_exists?(project)
wiki = ProjectWiki.new(project) wiki = ProjectWiki.new(project)
File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty? File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty?
end end
def project_hook_exists?(project)
Gitlab::Git::Hook.new('post-receive', project.repository.path).exists?
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment