Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
c3e3ea81
提交
c3e3ea81
编辑于
1 year ago
作者:
j.seto
浏览文件
操作
下载
补丁
差异文件
Refactor group approval rule api tests
Contributes to
https://gitlab.com/gitlab-org/gitlab/-/issues/440639
EE: true
上级
3ab00885
No related branches found
分支 包含提交
No related tags found
标签 包含提交
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
ee/spec/lib/ee/api/entities/group_approval_rule_spec.rb
+39
-0
39 个添加, 0 个删除
ee/spec/lib/ee/api/entities/group_approval_rule_spec.rb
ee/spec/requests/api/group_approval_rules_spec.rb
+32
-45
32 个添加, 45 个删除
ee/spec/requests/api/group_approval_rules_spec.rb
有
71 个添加
和
45 个删除
ee/spec/lib/ee/api/entities/group_approval_rule_spec.rb
0 → 100644
+
39
−
0
浏览文件 @
c3e3ea81
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
EE
::
API
::
Entities
::
GroupApprovalRule
,
feature_category: :source_code_management
do
subject
(
:hash
)
{
described_class
.
new
(
approval_rule
).
as_json
}
let
(
:approval_rule
)
{
build
(
:approval_group_rule
)
}
it
'exposes attributes'
do
expect
(
hash
.
keys
).
to
match_array
(
%i[
id
name
rule_type
eligible_approvers
approvals_required
users
groups
contains_hidden_groups
applies_to_all_protected_branches
]
)
end
context
'when multiple_approval_rules feature is available'
do
before
do
stub_licensed_features
(
multiple_approval_rules:
true
)
end
it
'exposes protected branches'
do
expect
(
hash
.
has_key?
(
:protected_branches
)).
to
be_truthy
end
end
context
'when multiple_approval_rules feature is not available'
do
it
'does not protected branches'
do
expect
(
hash
.
has_key?
(
:protected_branches
)).
to
be_falsy
end
end
end
此差异已折叠。
点击以展开。
ee/spec/requests/api/group_approval_rules_spec.rb
+
32
−
45
浏览文件 @
c3e3ea81
...
...
@@ -4,93 +4,80 @@
RSpec
.
describe
API
::
GroupApprovalRules
,
:aggregate_failures
,
feature_category: :source_code_management
do
let_it_be
(
:group
)
{
create
(
:group_with_members
)
}
let_it_be
(
:group2
)
{
create
(
:group_with_members
)
}
let_it_be
(
:admin
)
{
create
(
:admin
)
}
let_it_be
(
:user
)
{
create
(
:admin
)
}
let_it_be
(
:user2
)
{
create
(
:user
)
}
let_it_be
(
:user_with_access
)
{
create
(
:user
)
}
let_it_be
(
:project
)
do
create
(
:project
,
:public
,
:repository
,
creator:
user
,
group:
group
,
create
(
:project
,
:public
,
:repository
,
creator:
user
_with_access
,
group:
group
,
only_allow_merge_if_pipeline_succeeds:
false
)
end
let_it_be
(
:protected_branches
)
{
create_list
(
:protected_branch
,
2
,
project:
project
)
}
let_it_be
(
:approver
)
{
create
(
:user
)
}
let_it_be
(
:other_approver
)
{
create
(
:user
)
}
before_all
do
group
.
add_maintainer
(
user2
)
end
before
do
stub_licensed_features
(
merge_request_approvers:
true
)
end
before_all
do
group
.
add_owner
(
user_with_access
)
end
describe
'POST /groups/:id/approval_rules'
do
let
(
:schema
)
{
'public_api/v4/group_approval_rule'
}
let
(
:url
)
{
"/groups/
#{
group
.
id
}
/approval_rules"
}
let
(
:current_user
)
{
user
}
let
(
:current_user
)
{
user
_with_access
}
let
(
:name
)
{
'name'
}
let
(
:params
)
do
let
(
:
required_
params
)
do
{
name:
name
,
approvals_required:
10
}
end
let
(
:params
)
{
required_params
}
subject
(
:request
)
{
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
}
context
'when approval_group_rules flag is disabled'
do
before
do
stub_feature_flags
(
approval_group_rules:
false
)
end
it
'returns 404'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
request
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
it
'returns 201 status'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
request
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
expect
(
response
).
to
match_response_schema
(
schema
,
dir:
'ee'
)
end
context
'when multiple_approval_rules feature is available'
do
before
do
stub_licensed_features
(
multiple_approval_rules:
true
)
end
it
'returns protected branches'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
expect
(
json_response
[
'protected_branches'
].
size
).
to
be
2
end
end
context
'when the user is an admin'
do
let
(
:current_user
)
{
create
(
:admin
)
}
context
'when multiple_approval_rules feature is not available'
do
it
'does not return protected branches'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
it
'returns 201 status'
do
request
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
expect
(
json_response
).
not_to
include
(
'protected_branches'
)
end
end
context
'when
a
user
is without
access'
do
let
(
:current_user
)
{
user
2
}
context
'when
the
user
does not have
access'
do
let
(
:current_user
)
{
create
(
:
user
)
}
it
'returns 403'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
request
expect
(
response
).
to
have_gitlab_http_status
(
:forbidden
)
end
end
context
'when missing parameters'
do
let
(
:params
)
{
{}
}
it
'returns 400 status'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
)
request
expect
(
response
).
to
have_gitlab_http_status
(
:bad_request
)
end
...
...
@@ -100,7 +87,7 @@
let
(
:name
)
{
''
}
it
'returns 400 status'
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
request
expect
(
response
).
to
have_gitlab_http_status
(
:bad_request
)
expect
(
json_response
[
'message'
]).
to
eq
({
"name"
=>
[
"can't be blank"
]
})
...
...
@@ -108,24 +95,24 @@
end
context
'with user_id or group_id params'
do
before
do
post
api
(
url
,
current_user
,
admin_mode:
current_user
.
admin?
),
params:
params
.
merge!
(
extra_params
)
end
context
'with user_ids'
do
let
(
:
extra_
params
)
{
{
user_ids:
[
user
2
.
id
]
}
}
let
(
:params
)
{
required_params
.
merge
(
user_ids:
[
user
_with_access
.
id
]
)
}
it
'returns a user'
do
request
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
expect
(
json_response
[
'users'
].
size
).
to
be
1
expect
(
json_response
.
dig
(
'users'
,
0
,
'id'
)).
to
eq
(
user
2
.
id
)
expect
(
json_response
.
dig
(
'users'
,
0
,
'id'
)).
to
eq
(
user
_with_access
.
id
)
end
end
context
'with group_ids'
do
let
(
:
extra_
params
)
{
{
group_ids:
[
group
.
id
]
}
}
let
(
:params
)
{
required_params
.
merge
(
group_ids:
[
group
.
id
]
)
}
it
'returns a group'
do
request
expect
(
response
).
to
have_gitlab_http_status
(
:created
)
expect
(
json_response
[
'groups'
].
size
).
to
be
1
expect
(
json_response
.
dig
(
'groups'
,
0
,
'id'
)).
to
eq
(
group
.
id
)
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录