Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
423fcb47
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,发现更多精彩内容 >>
提交
423fcb47
编写于
6月 12, 2018
作者:
M
Murat Dogan
提交者:
Phil Hughes
6月 12, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mergeError message has been binded using v-html directive
上级
d94b1621
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
6 deletion
+30
-6
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
...st_widget/components/states/mr_widget_failed_to_merge.vue
+6
-2
changelogs/unreleased/fix-br-decode.yml
changelogs/unreleased/fix-br-decode.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
...idget/components/states/mr_widget_failed_to_merge_spec.js
+19
-4
未找到文件。
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
浏览文件 @
423fcb47
<
script
>
<
script
>
import
{
n__
}
from
'
~/locale
'
;
import
{
n__
}
from
'
~/locale
'
;
import
{
stripHtml
}
from
'
~/lib/utils/text_utility
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
eventHub
from
'
../../event_hub
'
;
import
eventHub
from
'
../../event_hub
'
;
...
@@ -27,6 +28,9 @@ export default {
...
@@ -27,6 +28,9 @@ export default {
},
},
computed
:
{
computed
:
{
mergeError
()
{
return
this
.
mr
.
mergeError
?
stripHtml
(
this
.
mr
.
mergeError
,
'
'
).
trim
()
:
''
;
},
timerText
()
{
timerText
()
{
return
n__
(
return
n__
(
'
Refreshing in a second to show the updated status...
'
,
'
Refreshing in a second to show the updated status...
'
,
...
@@ -83,9 +87,9 @@ export default {
...
@@ -83,9 +87,9 @@ export default {
<span
class=
"bold"
>
<span
class=
"bold"
>
<span
<span
class=
"has-error-message"
class=
"has-error-message"
v-if=
"m
r.m
ergeError"
v-if=
"mergeError"
>
>
{{
m
r
.
m
ergeError
}}
.
{{
mergeError
}}
.
</span>
</span>
<span
v-else
>
<span
v-else
>
{{
s__
(
"
mrWidget|Merge failed.
"
)
}}
{{
s__
(
"
mrWidget|Merge failed.
"
)
}}
...
...
changelogs/unreleased/fix-br-decode.yml
0 → 100644
浏览文件 @
423fcb47
---
title
:
mergeError message has been binded using v-html directive
merge_request
:
19058
author
:
Murat Dogan
type
:
fixed
spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
浏览文件 @
423fcb47
...
@@ -6,6 +6,7 @@ import mountComponent from 'spec/helpers/vue_mount_component_helper';
...
@@ -6,6 +6,7 @@ import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe
(
'
MRWidgetFailedToMerge
'
,
()
=>
{
describe
(
'
MRWidgetFailedToMerge
'
,
()
=>
{
const
dummyIntervalId
=
1337
;
const
dummyIntervalId
=
1337
;
let
Component
;
let
Component
;
let
mr
;
let
vm
;
let
vm
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
...
@@ -13,10 +14,11 @@ describe('MRWidgetFailedToMerge', () => {
...
@@ -13,10 +14,11 @@ describe('MRWidgetFailedToMerge', () => {
spyOn
(
eventHub
,
'
$emit
'
);
spyOn
(
eventHub
,
'
$emit
'
);
spyOn
(
window
,
'
setInterval
'
).
and
.
returnValue
(
dummyIntervalId
);
spyOn
(
window
,
'
setInterval
'
).
and
.
returnValue
(
dummyIntervalId
);
spyOn
(
window
,
'
clearInterval
'
).
and
.
stub
();
spyOn
(
window
,
'
clearInterval
'
).
and
.
stub
();
mr
=
{
mergeError
:
'
Merge error happened
'
,
};
vm
=
mountComponent
(
Component
,
{
vm
=
mountComponent
(
Component
,
{
mr
:
{
mr
,
mergeError
:
'
Merge error happened.
'
,
},
});
});
});
});
...
@@ -44,6 +46,19 @@ describe('MRWidgetFailedToMerge', () => {
...
@@ -44,6 +46,19 @@ describe('MRWidgetFailedToMerge', () => {
expect
(
vm
.
timerText
).
toEqual
(
'
Refreshing in a second to show the updated status...
'
);
expect
(
vm
.
timerText
).
toEqual
(
'
Refreshing in a second to show the updated status...
'
);
});
});
});
});
describe
(
'
mergeError
'
,
()
=>
{
it
(
'
removes forced line breaks
'
,
done
=>
{
mr
.
mergeError
=
'
contains<br />line breaks<br />
'
;
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
mergeError
).
toBe
(
'
contains line breaks
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
});
});
describe
(
'
created
'
,
()
=>
{
describe
(
'
created
'
,
()
=>
{
...
@@ -103,7 +118,7 @@ describe('MRWidgetFailedToMerge', () => {
...
@@ -103,7 +118,7 @@ describe('MRWidgetFailedToMerge', () => {
it
(
'
renders given error
'
,
()
=>
{
it
(
'
renders given error
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.has-error-message
'
).
textContent
.
trim
()).
toEqual
(
expect
(
vm
.
$el
.
querySelector
(
'
.has-error-message
'
).
textContent
.
trim
()).
toEqual
(
'
Merge error happened.
.
'
,
'
Merge error happened.
'
,
);
);
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录