Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7d81614e
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,发现更多精彩内容 >>
提交
7d81614e
编写于
1月 07, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
3a593ca7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
10 deletion
+29
-10
app/assets/javascripts/mr_tabs_popover/components/popover.vue
...assets/javascripts/mr_tabs_popover/components/popover.vue
+6
-1
app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
...javascripts/vue_shared/components/notes/skeleton_note.vue
+1
-1
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+22
-8
未找到文件。
app/assets/javascripts/mr_tabs_popover/components/popover.vue
浏览文件 @
7d81614e
...
...
@@ -57,7 +57,12 @@ export default {
<icon
name=
"external-link"
:size=
"10"
/>
</gl-link>
</p>
<gl-button
variant=
"primary"
size=
"sm"
@
click=
"onDismiss"
>
<gl-button
variant=
"primary"
size=
"sm"
data-qa-selector=
"dismiss_popover_button"
@
click=
"onDismiss"
>
{{
__
(
'
Got it
'
)
}}
</gl-button>
</gl-popover>
...
...
app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
浏览文件 @
7d81614e
...
...
@@ -12,7 +12,7 @@ export default {
</
script
>
<
template
>
<timeline-entry-item
class=
"note note-wrapper"
>
<timeline-entry-item
class=
"note note-wrapper"
data-qa-selector=
"skeleton_note"
>
<div
class=
"timeline-icon"
></div>
<div
class=
"timeline-content"
>
<div
class=
"note-header"
></div>
...
...
qa/qa/page/merge_request/show.rb
浏览文件 @
7d81614e
...
...
@@ -6,6 +6,10 @@ module QA
class
Show
<
Page
::
Base
include
Page
::
Component
::
Note
view
'app/assets/javascripts/mr_tabs_popover/components/popover.vue'
do
element
:dismiss_popover_button
end
view
'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue'
do
element
:dropdown_toggle
element
:download_email_patches
...
...
@@ -42,6 +46,10 @@ module QA
element
:squash_checkbox
end
view
'app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue'
do
element
:skeleton_note
end
view
'app/views/projects/merge_requests/show.html.haml'
do
element
:notes_tab
element
:diffs_tab
...
...
@@ -69,28 +77,30 @@ module QA
has_text?
(
"No newline at end of file"
)
end
all_elements
(
:new_diff_line
).
first
.
hover
click_element
:diff_comment
fill_element
:reply_input
,
text
click_element
(
:diff_comment
)
fill_element
(
:reply_input
,
text
)
end
def
click_discussions_tab
click_element
:notes_tab
click_element
(
:notes_tab
)
finished_loading?
wait_for_loading
end
def
click_diffs_tab
click_element
:diffs_tab
click_element
(
:diffs_tab
)
finished_loading?
wait_for_loading
click_element
(
:dismiss_popover_button
)
if
has_element?
(
:dismiss_popover_button
)
end
def
click_pipeline_link
click_element
:pipeline_link
click_element
(
:pipeline_link
)
end
def
edit!
click_element
:edit_button
click_element
(
:edit_button
)
end
def
fast_forward_possible?
...
...
@@ -203,6 +213,10 @@ module QA
has_element?
(
:merge_request_error_content
)
end
end
def
wait_for_loading
finished_loading?
&&
has_no_element?
(
:skeleton_note
)
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录