Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d06df33d
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,体验更适合开发者的 AI 搜索 >>
提交
d06df33d
编写于
7月 25, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure current user can retry a build before showing the 'Retry' button
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
a448e4a6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
5 deletion
+28
-5
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+1
-1
spec/features/builds_spec.rb
spec/features/builds_spec.rb
+26
-4
未找到文件。
CHANGELOG
浏览文件 @
d06df33d
...
...
@@ -20,6 +20,7 @@ v 8.10.2 (unreleased)
- Disable MySQL foreign key checks before dropping all tables. !5472
- Use project ID in repository cache to prevent stale data from persisting across projects. !5460
- Ensure relative paths for video are rewritten as we do for images. !5474
- Ensure current user can retry a build before showing the 'Retry' button. !5476
v 8.10.1
- Refactor repository storages documentation. !5428
...
...
app/views/projects/builds/_sidebar.html.haml
浏览文件 @
d06df33d
...
...
@@ -40,7 +40,7 @@
.block
{
class:
(
"block-first"
if
!
@build
.
coverage
&&
!
(
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)))
}
.title
Build details
-
if
@build
.
retryable?
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
=
link_to
"Retry"
,
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'pull-right'
,
method: :post
-
if
@build
.
merge_request
%p
.build-detail-row
...
...
spec/features/builds_spec.rb
浏览文件 @
d06df33d
...
...
@@ -199,9 +199,13 @@ describe "Builds" do
click_link
'Retry'
end
it
{
expect
(
page
.
status_code
).
to
eq
(
200
)
}
it
{
expect
(
page
).
to
have_content
'pending'
}
it
{
expect
(
page
).
to
have_content
'Cancel'
}
it
'shows the right status and buttons'
do
expect
(
page
).
to
have_http_status
(
200
)
expect
(
page
).
to
have_content
'pending'
page
.
within
(
'aside.right-sidebar'
)
do
expect
(
page
).
to
have_content
'Cancel'
end
end
end
context
"Build from other project"
do
...
...
@@ -212,7 +216,25 @@ describe "Builds" do
page
.
driver
.
post
(
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build2
))
end
it
{
expect
(
page
.
status_code
).
to
eq
(
404
)
}
it
{
expect
(
page
).
to
have_http_status
(
404
)
}
end
context
"Build that current user is not allowed to retry"
do
before
do
@build
.
run!
@build
.
cancel!
@project
.
update
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PUBLIC
)
logout_direct
login_with
(
create
(
:user
))
visit
namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
)
end
it
'does not show the Retry button'
do
page
.
within
(
'aside.right-sidebar'
)
do
expect
(
page
).
not_to
have_content
'Retry'
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录