Commit c46f3bcb authored by James Lopez's avatar James Lopez

few fixes and new integration spec -WIP

parent c5bc2629
...@@ -66,7 +66,6 @@ module Gitlab ...@@ -66,7 +66,6 @@ module Gitlab
end end
def process_sub_relation(relation_hash, relation_item, sub_relation) def process_sub_relation(relation_hash, relation_item, sub_relation)
sub_relation_object = nil
if relation_hash.is_a?(Array) if relation_hash.is_a?(Array)
sub_relation_object = create_relation(sub_relation, relation_hash) sub_relation_object = create_relation(sub_relation, relation_hash)
else else
......
...@@ -14,7 +14,7 @@ module Gitlab ...@@ -14,7 +14,7 @@ module Gitlab
FileUtils.mkdir_p(repos_path) FileUtils.mkdir_p(repos_path)
FileUtils.mkdir_p(path_to_repo) FileUtils.mkdir_p(path_to_repo)
untar_czf(archive: @path, dir: path_to_repo) untar_zxf(archive: @path, dir: path_to_repo)
end end
private private
......
require 'spec_helper'
feature 'project import', feature: true, js: true do
include Select2Helper
let(:user) { create(:user) }
let!(:namespace) { create(:namespace, name: "asd", owner: user) }
background do
login_as(user)
end
scenario 'user imports an exported project successfully' do
visit new_project_path
select2('asd', from: '#project_namespace_id')
fill_in :project_path, with:'test-project-path', visible: true
click_link 'GitLab project'
expect(page).to have_content('GitLab export file')
expect(URI.parse(current_url).query).to eq('namespace_id=asd&path=test-project-path')
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