Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
e7a8aaf1
提交
e7a8aaf1
编辑于
2 years ago
作者:
Song Huang
提交者:
Max Woolf
2 years ago
浏览文件
操作
下载
补丁
差异文件
Add groups support to ProtectedBranchesFinder
上级
4d23d9d4
No related branches found
分支 包含提交
No related tags found
标签 包含提交
1 合并请求
!1355
Draft: Reset password by phone with geetest captcha
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
app/finders/protected_branches_finder.rb
+10
-4
10 个添加, 4 个删除
app/finders/protected_branches_finder.rb
spec/finders/protected_branches_finder_spec.rb
+39
-17
39 个添加, 17 个删除
spec/finders/protected_branches_finder_spec.rb
有
49 个添加
和
21 个删除
app/finders/protected_branches_finder.rb
+
10
−
4
浏览文件 @
e7a8aaf1
...
...
@@ -11,15 +11,21 @@
class
ProtectedBranchesFinder
LIMIT
=
100
attr_accessor
:project
,
:params
attr_accessor
:project
_or_group
,
:params
def
initialize
(
project
,
params
=
{})
@project
=
project
def
initialize
(
project
_or_group
,
params
=
{})
@project
_or_group
=
project
_or_group
@params
=
params
end
def
execute
protected_branches
=
project
.
limited_protected_branches
(
LIMIT
)
protected_branches
=
if
project_or_group
.
is_a?
(
Group
)
project_or_group
.
protected_branches
else
project_or_group
.
all_protected_branches
end
protected_branches
=
protected_branches
.
limit
(
LIMIT
)
by_name
(
protected_branches
)
end
...
...
此差异已折叠。
点击以展开。
spec/finders/protected_branches_finder_spec.rb
+
39
−
17
浏览文件 @
e7a8aaf1
...
...
@@ -3,35 +3,57 @@
require
'spec_helper'
RSpec
.
describe
ProtectedBranchesFinder
do
let
(
:project
)
{
create
(
:project
)
}
let!
(
:protected_branch
)
{
create
(
:protected_branch
,
project:
project
)
}
let!
(
:another_protected_branch
)
{
create
(
:protected_branch
,
project:
project
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let!
(
:project_protected_branch
)
{
create
(
:protected_branch
,
project:
project
)
}
let!
(
:another_project_protected_branch
)
{
create
(
:protected_branch
,
project:
project
)
}
let!
(
:group_protected_branch
)
{
create
(
:protected_branch
,
project:
nil
,
group:
group
)
}
let!
(
:another_group_protected_branch
)
{
create
(
:protected_branch
,
project:
nil
,
group:
group
)
}
let!
(
:other_protected_branch
)
{
create
(
:protected_branch
)
}
let
(
:params
)
{
{}
}
subject
{
described_class
.
new
(
entity
,
params
).
execute
}
describe
'#execute'
do
subject
{
described_class
.
new
(
project
,
params
).
execute
}
shared_examples
'execute by entity'
do
it
'returns all protected branches of project by default'
do
expect
(
subject
).
to
match_array
(
expected_branches
)
end
it
'returns all protected branches of project by default'
do
expect
(
subject
).
to
match_array
([
protected_branch
,
another_protected_branch
])
end
context
'when search param is present'
do
let
(
:params
)
{
{
search:
group_protected_branch
.
name
}
}
context
'when search param is present'
do
let
(
:params
)
{
{
search:
protected_branch
.
name
}
}
it
'filters by search param'
do
expect
(
subject
).
to
eq
([
group_protected_branch
])
end
end
context
'when there are more protected branches than the limit'
do
before
do
stub_const
(
"
#{
described_class
}
::LIMIT"
,
1
)
end
it
'filters by search param'
do
expect
(
subject
).
to
eq
([
protected_branch
])
it
'returns limited protected branches of project'
do
expect
(
subject
.
count
).
to
eq
(
1
)
end
end
end
context
'when there are more protected branches than the limit'
do
before
do
stub_const
(
"
#{
described_class
}
::LIMIT"
,
1
)
it_behaves_like
'execute by entity'
do
let
(
:entity
)
{
project
}
let
(
:expected_branches
)
do
[
project_protected_branch
,
another_project_protected_branch
,
group_protected_branch
,
another_group_protected_branch
]
end
end
it
'returns limited prot
ecte
d
b
ranches of project
'
do
expect
(
subject
.
count
).
to
eq
(
1
)
end
it_behaves_like
'ex
ec
u
te b
y entity
'
do
let
(
:entity
)
{
group
}
let
(
:expected_branches
)
{
[
group_protected_branch
,
another_group_protected_branch
]
}
end
end
end
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录