Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
96944979
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,发现更多精彩内容 >>
未验证
提交
96944979
编写于
10月 06, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typo in cycle analytics breaking time component
上级
6c5837ae
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
64 addition
and
1 deletion
+64
-1
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
...ripts/cycle_analytics/components/total_time_component.vue
+1
-1
changelogs/unreleased/fl-fix-ca-time-component.yml
changelogs/unreleased/fl-fix-ca-time-component.yml
+5
-0
spec/javascripts/cycle_analytics/total_time_component_spec.js
.../javascripts/cycle_analytics/total_time_component_spec.js
+58
-0
未找到文件。
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
浏览文件 @
96944979
...
...
@@ -20,7 +20,7 @@
<template
v-if=
"time.days"
>
{{
time
.
days
}}
<span>
{{
n__
(
'
day
'
,
'
days
'
,
time
.
days
)
}}
</span></
template
>
<
template
v-if=
"time.hours"
>
{{
time
.
hours
}}
<span>
{{
n__
(
'
Time|hr
'
,
'
Time|hrs
'
,
time
.
hours
)
}}
</span></
template
>
<
template
v-if=
"time.mins && !time.days"
>
{{
time
.
mins
}}
<span>
{{
n__
(
'
Time|min
'
,
'
Time|mins
'
,
time
.
mins
)
}}
</span></
template
>
<
template
v-if=
"time.seconds && hasDa === 1 || time.seconds === 0"
>
{{
time
.
seconds
}}
<span>
{{
s__
(
'
Time|s
'
)
}}
</span></
template
>
<
template
v-if=
"time.seconds && hasDa
ta
=== 1 || time.seconds === 0"
>
{{
time
.
seconds
}}
<span>
{{
s__
(
'
Time|s
'
)
}}
</span></
template
>
</template>
<
template
v-else
>
--
...
...
changelogs/unreleased/fl-fix-ca-time-component.yml
0 → 100644
浏览文件 @
96944979
---
title
:
Fix typo in cycle analytics breaking time component
merge_request
:
author
:
type
:
fixed
spec/javascripts/cycle_analytics/total_time_component_spec.js
0 → 100644
浏览文件 @
96944979
import
Vue
from
'
vue
'
;
import
component
from
'
~/cycle_analytics/components/total_time_component.vue
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
describe
(
'
Total time component
'
,
()
=>
{
let
vm
;
let
Component
;
beforeEach
(()
=>
{
Component
=
Vue
.
extend
(
component
);
});
afterEach
(()
=>
{
vm
.
$destroy
();
});
describe
(
'
With data
'
,
()
=>
{
it
(
'
should render information for days and hours
'
,
()
=>
{
vm
=
mountComponent
(
Component
,
{
time
:
{
days
:
3
,
hours
:
4
,
},
});
expect
(
vm
.
$el
.
textContent
.
trim
()).
toEqual
(
'
3 days 4 hrs
'
);
});
it
(
'
should render information for hours and minutes
'
,
()
=>
{
vm
=
mountComponent
(
Component
,
{
time
:
{
hours
:
4
,
mins
:
35
,
},
});
expect
(
vm
.
$el
.
textContent
.
trim
()).
toEqual
(
'
4 hrs 35 mins
'
);
});
it
(
'
should render information for seconds
'
,
()
=>
{
vm
=
mountComponent
(
Component
,
{
time
:
{
seconds
:
45
,
},
});
expect
(
vm
.
$el
.
textContent
.
trim
()).
toEqual
(
'
45 s
'
);
});
});
describe
(
'
Without data
'
,
()
=>
{
it
(
'
should render no information
'
,
()
=>
{
vm
=
mountComponent
(
Component
);
expect
(
vm
.
$el
.
textContent
.
trim
()).
toEqual
(
'
--
'
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录