Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
56c62208
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,发现更多精彩内容 >>
提交
56c62208
编写于
1月 28, 2019
作者:
M
Martin Hobert
提交者:
Fatih Acet
1月 28, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from
上级
bbf6e65d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
115 addition
and
10 deletion
+115
-10
app/assets/javascripts/notes/components/discussion_resolve_button.vue
...avascripts/notes/components/discussion_resolve_button.vue
+28
-0
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+8
-10
changelogs/unreleased/refactor-56366-extract-resolve-discussion-button.yml
...ased/refactor-56366-extract-resolve-discussion-button.yml
+5
-0
spec/javascripts/notes/components/discussion_resolve_button_spec.js
...cripts/notes/components/discussion_resolve_button_spec.js
+74
-0
未找到文件。
app/assets/javascripts/notes/components/discussion_resolve_button.vue
0 → 100644
浏览文件 @
56c62208
<
script
>
export
default
{
name
:
'
ResolveDiscussionButton
'
,
props
:
{
isResolving
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
buttonTitle
:
{
type
:
String
,
required
:
true
,
},
},
};
</
script
>
<
template
>
<button
ref=
"button"
type=
"button"
class=
"btn btn-default ml-sm-2"
@
click=
"$emit('onClick')"
>
<i
v-if=
"isResolving"
ref=
"isResolvingIcon"
aria-hidden=
"true"
class=
"fa fa-spinner fa-spin"
></i>
{{
buttonTitle
}}
</button>
</
template
>
app/assets/javascripts/notes/components/noteable_discussion.vue
浏览文件 @
56c62208
...
...
@@ -12,6 +12,7 @@ import { SYSTEM_NOTE } from '../constants';
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
noteableNote
from
'
./noteable_note.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
resolveDiscussionButton
from
'
./discussion_resolve_button.vue
'
;
import
toggleRepliesWidget
from
'
./toggle_replies_widget.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
...
...
@@ -35,6 +36,7 @@ export default {
noteSignedOutWidget
,
noteEditedText
,
noteForm
,
resolveDiscussionButton
,
jumpToNextDiscussionButton
,
toggleRepliesWidget
,
placeholderNote
,
...
...
@@ -453,16 +455,12 @@ Please check your network connection and try again.`;
>
Reply...
</button>
<div
v-if=
"discussion.resolvable"
>
<button
type=
"button"
class=
"btn btn-default ml-sm-2"
@
click=
"resolveHandler()"
>
<i
v-if=
"isResolving"
aria-hidden=
"true"
class=
"fa fa-spinner fa-spin"
></i>
{{
resolveButtonTitle
}}
</button>
</div>
<resolve-discussion-button
v-if=
"discussion.resolvable"
:is-resolving=
"isResolving"
:button-title=
"resolveButtonTitle"
@
onClick=
"resolveHandler"
/>
<div
v-if=
"discussion.resolvable"
class=
"btn-group discussion-actions ml-sm-2"
...
...
changelogs/unreleased/refactor-56366-extract-resolve-discussion-button.yml
0 → 100644
浏览文件 @
56c62208
---
title
:
Refactored NoteableDiscussion by extracting ResolveDiscussionButton
merge_request
:
24505
author
:
Martin Hobert
type
:
other
spec/javascripts/notes/components/discussion_resolve_button_spec.js
0 → 100644
浏览文件 @
56c62208
import
resolveDiscussionButton
from
'
~/notes/components/discussion_resolve_button.vue
'
;
import
{
createLocalVue
,
shallowMount
}
from
'
@vue/test-utils
'
;
const
buttonTitle
=
'
Resolve discussion
'
;
describe
(
'
resolveDiscussionButton
'
,
()
=>
{
let
wrapper
;
let
localVue
;
const
factory
=
options
=>
{
localVue
=
createLocalVue
();
wrapper
=
shallowMount
(
resolveDiscussionButton
,
{
localVue
,
...
options
,
});
};
beforeEach
(()
=>
{
factory
({
propsData
:
{
isResolving
:
false
,
buttonTitle
,
},
});
});
afterEach
(()
=>
{
wrapper
.
destroy
();
});
it
(
'
should emit a onClick event on button click
'
,
()
=>
{
const
button
=
wrapper
.
find
({
ref
:
'
button
'
});
button
.
trigger
(
'
click
'
);
expect
(
wrapper
.
emitted
()).
toEqual
({
onClick
:
[[]],
});
});
it
(
'
should contain the provided button title
'
,
()
=>
{
const
button
=
wrapper
.
find
({
ref
:
'
button
'
});
expect
(
button
.
text
()).
toContain
(
buttonTitle
);
});
it
(
'
should show a loading spinner while resolving
'
,
()
=>
{
factory
({
propsData
:
{
isResolving
:
true
,
buttonTitle
,
},
});
const
button
=
wrapper
.
find
({
ref
:
'
isResolvingIcon
'
});
expect
(
button
.
exists
()).
toEqual
(
true
);
});
it
(
'
should only show a loading spinner while resolving
'
,
()
=>
{
factory
({
propsData
:
{
isResolving
:
false
,
buttonTitle
,
},
});
const
button
=
wrapper
.
find
({
ref
:
'
isResolvingIcon
'
});
localVue
.
nextTick
(()
=>
{
expect
(
button
.
exists
()).
toEqual
(
false
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录