Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
566be168
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,发现更多精彩内容 >>
未验证
提交
566be168
编写于
2月 22, 2018
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get rid of hard-coded user/project/group names that could clash with DB sequences
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
d1ceb600
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
10 deletion
+10
-10
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+4
-4
spec/requests/openid_connect_spec.rb
spec/requests/openid_connect_spec.rb
+6
-6
未找到文件。
spec/features/projects_spec.rb
浏览文件 @
566be168
...
...
@@ -146,8 +146,8 @@ feature 'Project' do
end
describe
'removal'
,
:js
do
let
(
:user
)
{
create
(
:user
,
username:
'test'
,
name:
'test'
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
,
name:
'project1'
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
)
}
before
do
sign_in
(
user
)
...
...
@@ -156,8 +156,8 @@ feature 'Project' do
end
it
'removes a project'
do
expect
{
remove_with_confirm
(
'Remove project'
,
project
.
path
)
}.
to
change
{
Project
.
count
}.
by
(
-
1
)
expect
(
page
).
to
have_content
"Project '
test / project1
' is in the process of being deleted."
expect
{
remove_with_confirm
(
'Remove project'
,
project
.
path
)
}.
to
change
{
Project
.
count
}.
by
(
-
1
)
expect
(
page
).
to
have_content
"Project '
#{
project
.
full_name
}
' is in the process of being deleted."
expect
(
Project
.
all
.
count
).
to
be_zero
expect
(
project
.
issues
).
to
be_empty
expect
(
project
.
merge_requests
).
to
be_empty
...
...
spec/requests/openid_connect_spec.rb
浏览文件 @
566be168
...
...
@@ -68,10 +68,10 @@ describe 'OpenID Connect requests' do
let!
(
:public_email
)
{
build
:email
,
email:
'public@example.com'
}
let!
(
:private_email
)
{
build
:email
,
email:
'private@example.com'
}
let!
(
:group1
)
{
create
:group
,
path:
'group1'
}
let!
(
:group2
)
{
create
:group
,
path:
'group2'
}
let!
(
:group3
)
{
create
:group
,
pa
th:
'group3'
,
pa
rent:
group2
}
let!
(
:group4
)
{
create
:group
,
pa
th:
'group4'
,
pa
rent:
group3
}
let!
(
:group1
)
{
create
:group
}
let!
(
:group2
)
{
create
:group
}
let!
(
:group3
)
{
create
:group
,
parent:
group2
}
let!
(
:group4
)
{
create
:group
,
parent:
group3
}
before
do
group1
.
add_user
(
user
,
GroupMember
::
OWNER
)
...
...
@@ -93,8 +93,8 @@ describe 'OpenID Connect requests' do
'groups'
=>
anything
}))
expected_groups
=
%w[group1 group2/group3
]
expected_groups
<<
'group2/group3/group4'
if
Group
.
supports_nested_groups?
expected_groups
=
[
group1
.
full_path
,
group3
.
full_path
]
expected_groups
<<
group4
.
full_path
if
Group
.
supports_nested_groups?
expect
(
json_response
[
'groups'
]).
to
match_array
(
expected_groups
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录