Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c822fdb9
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,发现更多精彩内容 >>
提交
c822fdb9
编写于
7月 02, 2019
作者:
F
Fabio Papa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Apply recomended changes from merge coach
上级
a8165fec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
9 deletion
+10
-9
db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
.../20190626175626_add_group_creation_level_to_namespaces.rb
+0
-1
spec/features/admin/admin_groups_spec.rb
spec/features/admin/admin_groups_spec.rb
+1
-2
spec/features/groups/show_spec.rb
spec/features/groups/show_spec.rb
+9
-6
未找到文件。
db/migrate/20190626175626_add_group_creation_level_to_namespaces.rb
浏览文件 @
c822fdb9
...
...
@@ -4,7 +4,6 @@ class AddGroupCreationLevelToNamespaces < ActiveRecord::Migration[5.1]
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column
(
:namespaces
,
:subgroup_creation_level
,
:integer
)
...
...
spec/features/admin/admin_groups_spec.rb
浏览文件 @
c822fdb9
...
...
@@ -107,8 +107,7 @@ describe 'Admin Groups' do
visit
admin_group_edit_path
(
group
)
expect
(
page
).
to
have_select
(
"group_subgroup_creation_level"
,
selected:
::
Gitlab
::
Access
.
subgroup_creation_options
.
keys
[
group
.
subgroup_creation_level
])
expect
(
page
).
to
have_content
(
'Allowed to create subgroups'
)
end
it
'edit group path does not change group name'
,
:js
do
...
...
spec/features/groups/show_spec.rb
浏览文件 @
c822fdb9
...
...
@@ -57,11 +57,11 @@ describe 'Group show page' do
context
'subgroup support'
do
let
(
:restricted_group
)
do
create
(
:group
,
subgroup_creation_level:
::
Gitlab
::
Access
::
OWNER_SUBGROUP_ACCESS
)
create
(
:group
,
subgroup_creation_level:
::
Gitlab
::
Access
::
OWNER_SUBGROUP_ACCESS
)
end
let
(
:relaxed_group
)
do
create
(
:group
,
subgroup_creation_level:
::
Gitlab
::
Access
::
MAINTAINER_SUBGROUP_ACCESS
)
create
(
:group
,
subgroup_creation_level:
::
Gitlab
::
Access
::
MAINTAINER_SUBGROUP_ACCESS
)
end
let
(
:owner
)
{
create
(
:user
)
}
...
...
@@ -78,10 +78,11 @@ describe 'Group show page' do
context
'when subgroups are supported'
,
:nested_groups
do
before
do
allow
(
Group
).
to
receive
(
:supports_nested_objects?
)
{
true
}
visit
path
end
it
'allows creating subgroups'
do
visit
path
expect
(
page
)
.
to
have_css
(
"li[data-text='New subgroup']"
,
visible:
false
)
end
...
...
@@ -90,10 +91,11 @@ describe 'Group show page' do
context
'when subgroups are not supported'
do
before
do
allow
(
Group
).
to
receive
(
:supports_nested_objects?
)
{
false
}
visit
path
end
it
'does not allow creating subgroups'
do
visit
path
expect
(
page
)
.
not_to
have_selector
(
"li[data-text='New subgroup']"
,
visible:
false
)
end
...
...
@@ -113,11 +115,12 @@ describe 'Group show page' do
context
'when subgroup_creation_level is set to maintainers'
do
before
do
relaxed_group
.
add_maintainer
(
maintainer
)
path
=
group_path
(
relaxed_group
)
visit
path
end
it
'allows creating subgroups'
do
path
=
group_path
(
relaxed_group
)
visit
path
expect
(
page
)
.
to
have_css
(
"li[data-text='New subgroup']"
,
visible:
false
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录