Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a825dc22
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,发现更多精彩内容 >>
未验证
提交
a825dc22
编写于
7月 11, 2018
作者:
D
ddavison
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move #has_milestone? to issuable sidebar;
closes #48690
上级
a781d0f9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
11 deletion
+13
-11
qa/qa/page/issuable/sidebar.rb
qa/qa/page/issuable/sidebar.rb
+7
-0
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+0
-6
qa/qa/specs/features/merge_request/create_spec.rb
qa/qa/specs/features/merge_request/create_spec.rb
+6
-5
未找到文件。
qa/qa/page/issuable/sidebar.rb
浏览文件 @
a825dc22
...
...
@@ -4,6 +4,7 @@ module QA
class
Sidebar
<
Page
::
Base
view
'app/views/shared/issuable/_sidebar.html.haml'
do
element
:labels_block
,
".issuable-show-labels"
element
:milestones_block
,
'.block.milestone'
end
def
has_label?
(
label
)
...
...
@@ -11,6 +12,12 @@ module QA
!!
find
(
'span'
,
text:
label
)
end
end
def
has_milestone?
(
milestone
)
page
.
within
(
'.block.milestone'
)
do
!!
find
(
"[href*='/milestones/']"
,
text:
milestone
)
end
end
end
end
end
...
...
qa/qa/page/merge_request/show.rb
浏览文件 @
a825dc22
...
...
@@ -79,12 +79,6 @@ module QA
click_element
:squash_checkbox
end
def
has_milestone?
(
milestone_title
)
page
.
within
(
'.issuable-sidebar'
)
do
!!
find
(
"[href*='/milestones/']"
,
text:
milestone_title
,
wait:
1
)
end
end
end
end
end
...
...
qa/qa/specs/features/merge_request/create_spec.rb
浏览文件 @
a825dc22
...
...
@@ -20,11 +20,12 @@ module QA
merge_request
.
milestone
=
current_milestone
end
Page
::
MergeRequest
::
Show
.
perform
do
|
merge_request
|
expect
(
page
).
to
have_content
(
'This is a merge request with a milestone'
)
expect
(
page
).
to
have_content
(
'Great feature with milestone'
)
expect
(
page
).
to
have_content
(
/Opened [\w\s]+ ago/
)
expect
(
merge_request
).
to
have_milestone
(
current_milestone
.
title
)
expect
(
page
).
to
have_content
(
'This is a merge request with a milestone'
)
expect
(
page
).
to
have_content
(
'Great feature with milestone'
)
expect
(
page
).
to
have_content
(
/Opened [\w\s]+ ago/
)
Page
::
Issuable
::
Sidebar
.
perform
do
|
sidebar
|
expect
(
sidebar
).
to
have_milestone
(
current_milestone
.
title
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录