Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cf353bd3
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,发现更多精彩内容 >>
提交
cf353bd3
编写于
1月 15, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed spinach test
上级
752eb2c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
10 deletion
+13
-10
features/project/commits/commit_diff_comments.feature
features/project/commits/commit_diff_comments.feature
+6
-5
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+7
-5
未找到文件。
features/project/commits/commit_diff_comments.feature
浏览文件 @
cf353bd3
...
...
@@ -84,8 +84,9 @@ Feature: Comments on commit diffs
Then
I should not see the diff comment form
And
I should see a discussion reply button
@javascript
Scenario
:
I
can delete a discussion comment
Given
I leave a diff comment like
"Typo, please fix"
And
I delete a diff comment
Then
I should not see a diff comment saying
"Typo, please fix"
#@wip @javascript
#Scenario: I can delete a discussion comment
# Given I leave a diff comment like "Typo, please fix"
# And I delete a diff comment
# Then I should not see a diff comment saying "Typo, please fix"
features/steps/project/project_merge_requests.rb
浏览文件 @
cf353bd3
...
...
@@ -103,6 +103,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'I leave a comment on the diff page'
do
find
(
"#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185 .add-diff-note"
).
click
within
(
'.js-temp-notes-holder'
)
do
fill_in
"note_note"
,
with:
"One comment to rule them all"
click_button
"Add Comment"
...
...
@@ -122,7 +124,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
Then
'I should see a discussion has started on line 185'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
first_commit
=
mr
.
commits
.
first
first_diff
=
mr
.
diffs
.
first
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on this merge request diff"
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
page
.
should
have_content
"Line is wrong"
...
...
@@ -131,7 +133,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
Then
'I should see a discussion has started on commit bcf03b5de6c:L185'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
first_commit
=
mr
.
commits
.
first
first_diff
=
mr
.
diffs
.
first
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on commit"
page
.
should
have_content
first_commit
.
short_id
(
8
)
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
...
...
@@ -141,10 +143,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
Then
'I should see a discussion has started on commit bcf03b5de6c'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
first_commit
=
mr
.
st_commits
.
first
first_diff
=
mr
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on commit"
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on commit
bcf03b5de6c
"
page
.
should
have_content
first_commit
.
short_id
(
8
)
page
.
should
have_content
"One comment to rule them all"
page
.
should
_not
have_content
"
#{
first_diff
.
b_path
}
:L185"
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录