Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dd0806d0
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,发现更多精彩内容 >>
提交
dd0806d0
编写于
10月 11, 2018
作者:
F
Filipa Lacerda
提交者:
Mike Greiling
10月 11, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix erased block not being rendered when job was erased
上级
e5ae0be4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
6 deletion
+23
-6
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+2
-2
changelogs/unreleased/52570-erased-block.yml
changelogs/unreleased/52570-erased-block.yml
+5
-0
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+13
-0
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+3
-4
未找到文件。
app/assets/javascripts/jobs/components/job_app.vue
浏览文件 @
dd0806d0
...
...
@@ -87,8 +87,8 @@
/>
<erased-block
v-if=
"job.erased"
class=
"js-job-erased"
v-if=
"job.erased
_at
"
class=
"js-job-erased
-block
"
:user=
"job.erased_by"
:erased-at=
"job.erased_at"
/>
...
...
changelogs/unreleased/52570-erased-block.yml
0 → 100644
浏览文件 @
dd0806d0
---
title
:
Fix erased block not being rendered when job was erased
merge_request
:
22294
author
:
type
:
fixed
spec/features/projects/jobs_spec.rb
浏览文件 @
dd0806d0
...
...
@@ -663,6 +663,19 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
expect
(
page
).
to
have_content
(
'This job does not have a trace.'
)
end
end
context
'with erased job'
,
:js
do
let
(
:job
)
{
create
(
:ci_build
,
:erased
,
pipeline:
pipeline
)
}
it
'renders erased job warning'
do
visit
project_job_path
(
project
,
job
)
wait_for_requests
page
.
within
(
'.js-job-erased-block'
)
do
expect
(
page
).
to
have_content
(
'Job has been erased'
)
end
end
end
end
describe
"POST /:project/jobs/:id/cancel"
,
:js
do
...
...
spec/javascripts/jobs/components/job_app_spec.js
浏览文件 @
dd0806d0
...
...
@@ -223,7 +223,6 @@ describe('Job App ', () => {
store
.
dispatch
(
'
receiveJobSuccess
'
,
Object
.
assign
({},
job
,
{
erased
:
true
,
erased_by
:
{
username
:
'
root
'
,
web_url
:
'
gitlab.com/root
'
,
...
...
@@ -237,18 +236,18 @@ describe('Job App ', () => {
store
,
});
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-erased
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-erased
-block
'
)).
not
.
toBeNull
();
});
it
(
'
does not render erased block when `erased` is false
'
,
()
=>
{
store
.
dispatch
(
'
receiveJobSuccess
'
,
Object
.
assign
({},
job
,
{
erased
:
false
}));
store
.
dispatch
(
'
receiveJobSuccess
'
,
Object
.
assign
({},
job
,
{
erased
_at
:
null
}));
vm
=
mountComponentWithStore
(
Component
,
{
props
,
store
,
});
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-erased
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-erased
-block
'
)).
toBeNull
();
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录