Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ff72bba1
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,发现更多精彩内容 >>
提交
ff72bba1
编写于
10月 26, 2018
作者:
W
Winnie Hellmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add dynamic timer for delayed jobs on single job page
上级
74f22d26
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
1 deletion
+44
-1
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+15
-1
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+29
-0
未找到文件。
app/assets/javascripts/jobs/components/job_app.vue
浏览文件 @
ff72bba1
...
@@ -14,6 +14,8 @@ import Log from './job_log.vue';
...
@@ -14,6 +14,8 @@ import Log from './job_log.vue';
import
LogTopBar
from
'
./job_log_controllers.vue
'
;
import
LogTopBar
from
'
./job_log_controllers.vue
'
;
import
StuckBlock
from
'
./stuck_block.vue
'
;
import
StuckBlock
from
'
./stuck_block.vue
'
;
import
Sidebar
from
'
./sidebar.vue
'
;
import
Sidebar
from
'
./sidebar.vue
'
;
import
{
sprintf
}
from
'
~/locale
'
;
import
delayedJobMixin
from
'
../mixins/delayed_job_mixin
'
;
export
default
{
export
default
{
name
:
'
JobPageApp
'
,
name
:
'
JobPageApp
'
,
...
@@ -30,6 +32,7 @@ export default {
...
@@ -30,6 +32,7 @@ export default {
StuckBlock
,
StuckBlock
,
Sidebar
,
Sidebar
,
},
},
mixins
:
[
delayedJobMixin
],
props
:
{
props
:
{
runnerSettingsUrl
:
{
runnerSettingsUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -89,6 +92,17 @@ export default {
...
@@ -89,6 +92,17 @@ export default {
shouldRenderContent
()
{
shouldRenderContent
()
{
return
!
this
.
isLoading
&&
!
this
.
hasError
;
return
!
this
.
isLoading
&&
!
this
.
hasError
;
},
},
emptyStateTitle
()
{
const
{
emptyStateIllustration
,
remainingTime
}
=
this
;
const
{
title
}
=
emptyStateIllustration
;
if
(
this
.
isDelayedJob
)
{
return
sprintf
(
title
,
{
remainingTime
});
}
return
title
;
},
},
},
watch
:
{
watch
:
{
// Once the job log is loaded,
// Once the job log is loaded,
...
@@ -250,7 +264,7 @@ export default {
...
@@ -250,7 +264,7 @@ export default {
class=
"js-job-empty-state"
class=
"js-job-empty-state"
:illustration-path=
"emptyStateIllustration.image"
:illustration-path=
"emptyStateIllustration.image"
:illustration-size-class=
"emptyStateIllustration.size"
:illustration-size-class=
"emptyStateIllustration.size"
:title=
"emptyState
Illustration.t
itle"
:title=
"emptyState
T
itle"
:content=
"emptyStateIllustration.content"
:content=
"emptyStateIllustration.content"
:action=
"emptyStateAction"
:action=
"emptyStateAction"
/>
/>
...
...
spec/javascripts/jobs/components/job_app_spec.js
浏览文件 @
ff72bba1
...
@@ -8,6 +8,7 @@ import { resetStore } from '../store/helpers';
...
@@ -8,6 +8,7 @@ import { resetStore } from '../store/helpers';
import
job
from
'
../mock_data
'
;
import
job
from
'
../mock_data
'
;
describe
(
'
Job App
'
,
()
=>
{
describe
(
'
Job App
'
,
()
=>
{
const
delayedJobFixture
=
getJSONFixture
(
'
jobs/delayed.json
'
);
const
Component
=
Vue
.
extend
(
jobApp
);
const
Component
=
Vue
.
extend
(
jobApp
);
let
store
;
let
store
;
let
vm
;
let
vm
;
...
@@ -420,6 +421,34 @@ describe('Job App ', () => {
...
@@ -420,6 +421,34 @@ describe('Job App ', () => {
done
();
done
();
},
0
);
},
0
);
});
});
it
(
'
displays remaining time for a delayed job
'
,
(
done
)
=>
{
const
oneHourInMilliseconds
=
3600000
;
spyOn
(
Date
,
'
now
'
).
and
.
callFake
(()
=>
new
Date
(
delayedJobFixture
.
scheduled_at
).
getTime
()
-
oneHourInMilliseconds
);
mock
.
onGet
(
props
.
endpoint
).
replyOnce
(
200
,
{
...
delayedJobFixture
});
vm
=
mountComponentWithStore
(
Component
,
{
props
,
store
,
});
store
.
subscribeAction
((
action
)
=>
{
if
(
action
.
type
!==
'
receiveJobSuccess
'
)
{
return
;
}
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-empty-state
'
)).
not
.
toBeNull
();
const
title
=
vm
.
$el
.
querySelector
(
'
.js-job-empty-state-title
'
);
expect
(
title
).
toContainText
(
'
01:00:00
'
);
done
();
})
.
catch
(
done
.
fail
);
});
});
});
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录