Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
46503b78
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,发现更多精彩内容 >>
未验证
提交
46503b78
编写于
9月 30, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix invalid tests
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
fe7e9732
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
36 deletion
+36
-36
features/project/merge_requests.feature
features/project/merge_requests.feature
+18
-18
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+18
-18
未找到文件。
features/project/merge_requests.feature
浏览文件 @
46503b78
...
...
@@ -115,40 +115,40 @@ Feature: Project Merge Requests
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
And
I leave a comment like
"Line is wrong"
on line 39 of the
secon
d file
And
I click link
"Hide inline discussion"
of the
secon
d file
Then
I should not see a comment like
"Line is wrong here"
in the
secon
d file
And
I leave a comment like
"Line is wrong"
on line 39 of the
thir
d file
And
I click link
"Hide inline discussion"
of the
thir
d file
Then
I should not see a comment like
"Line is wrong here"
in the
thir
d file
@javascript
Scenario
:
I
show comments on a merge request diff with comments in a single file
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
And
I leave a comment like
"Line is wrong"
on line 39 of the
secon
d file
Then
I should see a comment like
"Line is wrong"
in the
secon
d file
And
I leave a comment like
"Line is wrong"
on line 39 of the
thir
d file
Then
I should see a comment like
"Line is wrong"
in the
thir
d file
@javascript
Scenario
:
I
hide comments on a merge request diff with comments in multiple files
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
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
secon
d file
And
I click link
"Hide inline discussion"
of the
secon
d file
Then
I should not see a comment like
"Line is wrong here"
in the
secon
d file
And
I should still see a comment like
"Line is correct"
in the
first
file
And
I leave a comment like
"Line is correct"
on line 12 of the
second
file
And
I leave a comment like
"Line is wrong"
on line 39 of the
thir
d file
And
I click link
"Hide inline discussion"
of the
thir
d file
Then
I should not see a comment like
"Line is wrong here"
in the
thir
d file
And
I should still see a comment like
"Line is correct"
in the
second
file
@javascript
Scenario
:
I
show comments on a merge request diff with comments in multiple files
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
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
secon
d file
And
I click link
"Hide inline discussion"
of the
secon
d file
And
I click link
"Show inline discussion"
of the
secon
d file
Then
I should see a comment like
"Line is wrong"
in the
secon
d file
And
I should still see a comment like
"Line is correct"
in the
first
file
And
I leave a comment like
"Line is correct"
on line 12 of the
second
file
And
I leave a comment like
"Line is wrong"
on line 39 of the
thir
d file
And
I click link
"Hide inline discussion"
of the
thir
d file
And
I click link
"Show inline discussion"
of the
thir
d file
Then
I should see a comment like
"Line is wrong"
in the
thir
d file
And
I should still see a comment like
"Line is correct"
in the
second
file
@javascript
Scenario
:
I
unfold diff
...
...
@@ -163,8 +163,8 @@ Feature: Project Merge Requests
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
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
secon
d file
And
I leave a comment like
"Line is correct"
on line 12 of the
second
file
And
I leave a comment like
"Line is wrong"
on line 39 of the
thir
d file
And
I click Side-by-side Diff tab
Then
I should see comments on the side-by-side diff page
...
...
features/steps/project/merge_requests.rb
浏览文件 @
46503b78
...
...
@@ -224,43 +224,43 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I click link "Hide inline discussion" of the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
)'
do
step
'I click link "Hide inline discussion" of the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
)'
do
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
end
end
step
'I click link "Show inline discussion" of the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
)'
do
step
'I click link "Show inline discussion" of the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
)'
do
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
end
end
step
'I should not see a comment like "Line is wrong" in the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
)'
do
step
'I should not see a comment like "Line is wrong" in the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
)'
do
expect
(
page
).
not_to
have_visible_content
"Line is wrong"
end
end
step
'I should see a comment like "Line is wrong" in the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
) .note-body > .note-text'
do
step
'I should see a comment like "Line is wrong" in the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
) .note-body > .note-text'
do
expect
(
page
).
to
have_visible_content
"Line is wrong"
end
end
step
'I should not see a comment like "Line is wrong here" in the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
)'
do
step
'I should not see a comment like "Line is wrong here" in the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
)'
do
expect
(
page
).
not_to
have_visible_content
"Line is wrong here"
end
end
step
'I should see a comment like "Line is wrong here" in the
secon
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
) .note-body > .note-text'
do
step
'I should see a comment like "Line is wrong here" in the
thir
d file'
do
page
.
within
'.files [id^=diff]:nth-child(
3
) .note-body > .note-text'
do
expect
(
page
).
to
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
step
'I leave a comment like "Line is correct" on line 12 of the
second
file'
do
init_diff_note_first_file
page
.
within
(
".js-discussion-note-form"
)
do
...
...
@@ -268,12 +268,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
click_button
"Add Comment"
end
page
.
within
".files [id^=diff]:nth-child(
1
) .note-body > .note-text"
do
page
.
within
".files [id^=diff]:nth-child(
2
) .note-body > .note-text"
do
expect
(
page
).
to
have_content
"Line is correct"
end
end
step
'I leave a comment like "Line is wrong" on line 39 of the
secon
d file'
do
step
'I leave a comment like "Line is wrong" on line 39 of the
thir
d file'
do
init_diff_note_second_file
page
.
within
(
".js-discussion-note-form"
)
do
...
...
@@ -282,8 +282,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should still see a comment like "Line is correct" in the
first
file'
do
page
.
within
'.files [id^=diff]:nth-child(
1
) .note-body > .note-text'
do
step
'I should still see a comment like "Line is correct" in the
second
file'
do
page
.
within
'.files [id^=diff]:nth-child(
2
) .note-body > .note-text'
do
expect
(
page
).
to
have_visible_content
"Line is correct"
end
end
...
...
@@ -303,7 +303,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step
'I should see comments on the side-by-side diff page'
do
page
.
within
'.files [id^=diff]:nth-child(
1
) .parallel .note-body > .note-text'
do
page
.
within
'.files [id^=diff]:nth-child(
2
) .parallel .note-body > .note-text'
do
expect
(
page
).
to
have_visible_content
"Line is correct"
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录