Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c2ea4941
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,发现更多精彩内容 >>
提交
c2ea4941
编写于
3月 09, 2018
作者:
M
Michael Kozono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor specs
上级
1f311a9c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
15 deletion
+27
-15
spec/lib/gitlab/project_transfer_spec.rb
spec/lib/gitlab/project_transfer_spec.rb
+24
-12
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+3
-3
未找到文件。
spec/lib/gitlab/project_transfer_spec.rb
浏览文件 @
c2ea4941
...
@@ -21,10 +21,12 @@ describe Gitlab::ProjectTransfer do
...
@@ -21,10 +21,12 @@ describe Gitlab::ProjectTransfer do
describe
'#move_project'
do
describe
'#move_project'
do
it
"moves project upload to another namespace"
do
it
"moves project upload to another namespace"
do
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
@project_path
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
@namespace_path_was
,
@project_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
move_project
(
@project_path
,
@namespace_path_was
,
@namespace_path
)
@project_transfer
.
move_project
(
@project_path
,
@namespace_path_was
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
...
@@ -33,10 +35,12 @@ describe Gitlab::ProjectTransfer do
...
@@ -33,10 +35,12 @@ describe Gitlab::ProjectTransfer do
context
'when moving namespace from root into another namespace'
do
context
'when moving namespace from root into another namespace'
do
it
"moves namespace projects' upload"
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
move_namespace
(
child_namespace
,
nil
,
@namespace_path
)
@project_transfer
.
move_namespace
(
child_namespace
,
nil
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
...
@@ -44,10 +48,12 @@ describe Gitlab::ProjectTransfer do
...
@@ -44,10 +48,12 @@ describe Gitlab::ProjectTransfer do
context
'when moving namespace from one parent to another'
do
context
'when moving namespace from one parent to another'
do
it
"moves namespace projects' upload"
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
@namespace_path
)
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
...
@@ -55,10 +61,12 @@ describe Gitlab::ProjectTransfer do
...
@@ -55,10 +61,12 @@ describe Gitlab::ProjectTransfer do
context
'when moving namespace from having a parent to root'
do
context
'when moving namespace from having a parent to root'
do
it
"moves namespace projects' upload"
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
)
expected_path
=
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
nil
)
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
nil
)
expected_path
=
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
...
@@ -66,20 +74,24 @@ describe Gitlab::ProjectTransfer do
...
@@ -66,20 +74,24 @@ describe Gitlab::ProjectTransfer do
describe
'#rename_project'
do
describe
'#rename_project'
do
it
"renames project"
do
it
"renames project"
do
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path_was
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path_was
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
rename_project
(
@project_path_was
,
@project_path
,
@namespace_path
)
@project_transfer
.
rename_project
(
@project_path_was
,
@project_path
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
describe
'#rename_namespace'
do
describe
'#rename_namespace'
do
it
"renames namespace"
do
it
"renames namespace"
do
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
@project_path
))
path_to_be_moved
=
File
.
join
(
@root_dir
,
@namespace_path_was
,
@project_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
FileUtils
.
mkdir_p
(
path_to_be_moved
)
@project_transfer
.
rename_namespace
(
@namespace_path_was
,
@namespace_path
)
@project_transfer
.
rename_namespace
(
@namespace_path_was
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
end
...
...
spec/models/namespace_spec.rb
浏览文件 @
c2ea4941
...
@@ -217,9 +217,9 @@ describe Namespace do
...
@@ -217,9 +217,9 @@ describe Namespace do
expected_upload_path
=
File
.
join
(
uploads_dir
,
namespace_path
,
'the-project'
)
expected_upload_path
=
File
.
join
(
uploads_dir
,
namespace_path
,
'the-project'
)
expected_pages_path
=
File
.
join
(
pages_dir
,
namespace_path
,
'the-project'
)
expected_pages_path
=
File
.
join
(
pages_dir
,
namespace_path
,
'the-project'
)
expect
(
File
.
directory?
(
expected_repository_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_repository_path
)).
to
be
_truthy
expect
(
File
.
directory?
(
expected_upload_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_upload_path
)).
to
be
_truthy
expect
(
File
.
directory?
(
expected_pages_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_pages_path
)).
to
be
_truthy
end
end
before
do
before
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录