Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
49cdb778
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
49cdb778
编写于
5月 06, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
few fixes to import specs and code
上级
4290e9c8
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
7 addition
and
6 deletion
+7
-6
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+3
-2
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+2
-2
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+0
-0
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+2
-2
未找到文件。
lib/gitlab/import_export/project_tree_restorer.rb
浏览文件 @
49cdb778
...
@@ -14,7 +14,8 @@ module Gitlab
...
@@ -14,7 +14,8 @@ module Gitlab
@tree_hash
=
ActiveSupport
::
JSON
.
decode
(
json
)
@tree_hash
=
ActiveSupport
::
JSON
.
decode
(
json
)
@project_members
=
@tree_hash
.
delete
(
'project_members'
)
@project_members
=
@tree_hash
.
delete
(
'project_members'
)
create_relations
create_relations
rescue
rescue
=>
e
# TODO: handle errors better, move them to a shared thing
false
false
end
end
...
@@ -83,7 +84,7 @@ module Gitlab
...
@@ -83,7 +84,7 @@ module Gitlab
def
relation_from_factory
(
relation
,
relation_hash
)
def
relation_from_factory
(
relation
,
relation_hash
)
Gitlab
::
ImportExport
::
RelationFactory
.
create
(
Gitlab
::
ImportExport
::
RelationFactory
.
create
(
relation_sym:
relation
,
relation_hash:
relation_hash
.
merge
(
'project_id'
=>
project
.
id
),
members_map:
members_map
)
relation_sym:
relation
.
to_sym
,
relation_hash:
relation_hash
.
merge
(
'project_id'
=>
project
.
id
),
members_map:
members_map
)
end
end
end
end
end
end
...
...
spec/lib/gitlab/import_export/members_mapper_spec.rb
浏览文件 @
49cdb778
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
MembersMapper
,
services:
true
do
describe
Gitlab
::
ImportExport
::
MembersMapper
,
services:
true
do
describe
:map
do
describe
'map members'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
name:
'searchable_project'
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
name:
'searchable_project'
)
}
...
@@ -31,7 +31,7 @@ describe Gitlab::ImportExport::MembersMapper, services: true do
...
@@ -31,7 +31,7 @@ describe Gitlab::ImportExport::MembersMapper, services: true do
end
end
let
(
:members_mapper
)
do
let
(
:members_mapper
)
do
Gitlab
::
ImportExport
::
MembersMapper
.
new
(
described_class
.
new
(
exported_members:
exported_members
,
user:
user
,
project_id:
project
.
id
)
exported_members:
exported_members
,
user:
user
,
project_id:
project
.
id
)
end
end
...
...
lib/gitlab/import_export/project.json
→
spec/
lib/gitlab/import_export/project.json
浏览文件 @
49cdb778
文件已移动
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
浏览文件 @
49cdb778
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
ProjectTreeRestorer
,
services:
true
do
describe
Gitlab
::
ImportExport
::
ProjectTreeRestorer
,
services:
true
do
describe
:restore
do
describe
'restore project tree'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
owner:
user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
owner:
user
)
}
let
(
:project_tree_restorer
)
{
Gitlab
::
ImportExport
::
ProjectTreeRestorer
.
new
(
path:
"lib/gitlab/import_export/"
,
user:
user
,
project_path:
'project'
,
namespace_id:
namespace
.
id
)
}
let
(
:project_tree_restorer
)
{
described_class
.
new
(
path:
Rails
.
root
.
join
(
"spec/lib/gitlab/import_export/"
)
,
user:
user
,
project_path:
'project'
,
namespace_id:
namespace
.
id
)
}
context
'JSON'
do
context
'JSON'
do
let
(
:restored_project_json
)
do
let
(
:restored_project_json
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录