Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5d642fb7
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,发现更多精彩内容 >>
提交
5d642fb7
编写于
4月 08, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix rubocop warnings
上级
de6c44e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
16 deletion
+16
-16
app/services/projects/import_export/import_export_reader.rb
app/services/projects/import_export/import_export_reader.rb
+7
-7
spec/services/projects/import_export/import_export_reader_spec.rb
...vices/projects/import_export/import_export_reader_spec.rb
+9
-9
未找到文件。
app/services/projects/import_export/import_export_reader.rb
浏览文件 @
5d642fb7
...
...
@@ -38,7 +38,8 @@ module Projects
def
process_include
(
hash
,
included_classes_hash
=
{})
hash
.
values
.
flatten
.
each
do
|
value
|
current_key
,
value
=
process_current_class
(
hash
,
included_classes_hash
,
value
)
current_key
=
hash
.
keys
.
first
value
=
process_current_class
(
hash
,
included_classes_hash
,
value
)
if
included_classes_hash
[
current_key
]
add_class
(
current_key
,
included_classes_hash
,
value
)
else
...
...
@@ -50,14 +51,13 @@ module Projects
def
process_current_class
(
hash
,
included_classes_hash
,
value
)
value
=
value
.
is_a?
(
Hash
)
?
process_include
(
hash
,
included_classes_hash
)
:
value
current_key
=
hash
.
keys
.
first
only_except_hash
=
check_only_and_except
(
current_key
)
included_classes_hash
[
current_key
]
||=
only_except_hash
unless
only_except_hash
.
empty?
return
current_key
,
value
only_except_hash
=
check_only_and_except
(
hash
.
keys
.
first
)
included_classes_hash
[
hash
.
keys
.
first
]
||=
only_except_hash
unless
only_except_hash
.
empty?
value
end
def
add_new_class
(
current_key
,
included_classes_hash
,
value
)
new_hash
=
{
:include
=>
value
}
new_hash
=
{
include:
value
}
new_hash
.
merge!
(
check_only_and_except
(
value
))
included_classes_hash
[
current_key
]
=
new_hash
end
...
...
@@ -88,4 +88,4 @@ module Projects
end
end
end
end
\ No newline at end of file
end
spec/services/projects/import_export/import_export_reader_spec.rb
浏览文件 @
5d642fb7
...
...
@@ -5,14 +5,14 @@ describe Projects::ImportExport::ImportExportReader do
let
(
:test_config
)
{
'spec/support/import_export/import_export.yml'
}
let
(
:project_tree_hash
)
do
{
:only
=>
[
:name
,
:path
],
:include
=>
[
:issues
,
:labels
,
{
:merge_requests
=>
{
:only
=>
[
:id
],
:except
=>
[
:iid
],
:include
=>
[
:merge_request_diff
,
:merge_request_test
]
}
},
{
:commit_statuses
=>
{
:include
=>
:commit
}
}]
only:
[
:name
,
:path
],
include:
[
:issues
,
:labels
,
{
merge_requests:
{
only:
[
:id
],
except:
[
:iid
],
include:
[
:merge_request_diff
,
:merge_request_test
]
}
},
{
commit_statuses:
{
include:
:commit
}
}]
}
end
...
...
@@ -21,4 +21,4 @@ describe Projects::ImportExport::ImportExportReader do
expect
(
described_class
.
project_tree
).
to
eq
(
project_tree_hash
)
end
end
\ No newline at end of file
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录