Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9535ce2c
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,发现更多精彩内容 >>
提交
9535ce2c
编写于
10月 06, 2014
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Preventing some duplication in MR feature tests by adding a different comment.
上级
270efdf2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
9 deletion
+15
-9
features/project/merge_requests.feature
features/project/merge_requests.feature
+2
-4
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+13
-5
未找到文件。
features/project/merge_requests.feature
浏览文件 @
9535ce2c
...
...
@@ -105,7 +105,7 @@ Feature: Project Merge Requests
And
I switch to the diff tab
And
I leave a comment like
"Line is wrong"
on line 39 of the second file
And
I click link
"Hide inline discussion"
of the second file
Then
I should not see a comment like
"Line is wrong"
in the second file
Then
I should not see a comment like
"Line is wrong
here
"
in the second file
@javascript
Scenario
:
I
show comments on a merge request diff with comments in a single file
...
...
@@ -113,8 +113,6 @@ Feature: Project Merge Requests
And
I visit merge request page
"Bug NS-05"
And
I switch to the diff tab
And
I leave a comment like
"Line is wrong"
on line 39 of the second file
And
I click link
"Hide inline discussion"
of the second file
And
I click link
"Show inline discussion"
of the second file
Then
I should see a comment like
"Line is wrong"
in the second file
@javascript
...
...
@@ -125,7 +123,7 @@ Feature: Project Merge Requests
And
I leave a comment like
"Line is correct"
on line 12 of the first file
And
I leave a comment like
"Line is wrong"
on line 39 of the second file
And
I click link
"Hide inline discussion"
of the second file
Then
I should not see a comment like
"Line is wrong"
in the second file
Then
I should not see a comment like
"Line is wrong
here
"
in the second file
And
I should still see a comment like
"Line is correct"
in the first file
@javascript
...
...
features/steps/project/merge_requests.rb
浏览文件 @
9535ce2c
...
...
@@ -211,6 +211,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should not see a comment like "Line is wrong here" in the second file'
do
within
'.files [id^=diff]:nth-child(2)'
do
page
.
should_not
have_visible_content
"Line is wrong here"
end
end
step
'I should see a comment like "Line is wrong here" in the second file'
do
within
'.files [id^=diff]:nth-child(2) .note-text'
do
page
.
should
have_visible_content
"Line is wrong here"
end
end
step
'I leave a comment like "Line is correct" on line 12 of the first file'
do
init_diff_note_first_file
...
...
@@ -228,13 +240,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
init_diff_note_second_file
within
(
".js-discussion-note-form"
)
do
fill_in
"note_note"
,
with:
"Line is wrong"
fill_in
"note_note"
,
with:
"Line is wrong
on here
"
click_button
"Add Comment"
end
within
".files [id^=diff]:nth-child(2) .note-text"
do
page
.
should
have_content
"Line is wrong"
end
end
step
'I should still see a comment like "Line is correct" in the first file'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录