Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e6b5f4ad
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,发现更多精彩内容 >>
提交
e6b5f4ad
编写于
2月 28, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor finders in spianch:merge_request.feature
上级
51b547f8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
22 deletion
+22
-22
features/project/merge_requests.feature
features/project/merge_requests.feature
+5
-5
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+17
-17
未找到文件。
features/project/merge_requests.feature
浏览文件 @
e6b5f4ad
...
...
@@ -34,11 +34,11 @@ Feature: Project Merge Requests
And
I submit new merge request
"Wiki Feature"
Then
I should see merge request
"Wiki Feature"
#
@javascript
#
Scenario: I comment on a merge request
#
Given I visit merge request page "Bug NS-04"
#
And I leave a comment like "XML attached"
#
Then I should see comment "XML attached"
@javascript
Scenario
:
I
comment on a merge request
Given
I visit merge request page
"Bug NS-04"
And
I leave a comment like
"XML attached"
Then
I should see comment
"XML attached"
@javascript
Scenario
:
I
comment on a merge request diff
...
...
features/steps/project/project_merge_requests.rb
浏览文件 @
e6b5f4ad
...
...
@@ -25,8 +25,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
Then
'I should see closed merge request "Bug NS-04"'
do
m
r
=
MergeRequest
.
find_by_title
(
"Bug NS-04"
)
m
r
.
closed?
.
should
be_true
m
erge_request
=
MergeRequest
.
find_by_title!
(
"Bug NS-04"
)
m
erge_request
.
closed?
.
should
be_true
page
.
should
have_content
"Closed by"
end
...
...
@@ -63,7 +63,6 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'project "Shop" have "Bug NS-04" open merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:merge_request
,
title:
"Bug NS-04"
,
project:
project
,
...
...
@@ -71,7 +70,6 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'project "Shop" have "Bug NS-05" open merge request with diffs inside'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:merge_request_with_diffs
,
title:
"Bug NS-05"
,
project:
project
,
...
...
@@ -79,7 +77,6 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'project "Shop" have "Feature NS-03" closed merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:closed_merge_request
,
title:
"Feature NS-03"
,
project:
project
,
...
...
@@ -87,18 +84,16 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'I switch to the diff tab'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
visit
diffs_project_merge_request_path
(
mr
.
project
,
mr
)
visit
diffs_project_merge_request_path
(
merge_request
.
project
,
merge_request
)
end
And
'I switch to the merge request\'s comments tab'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
visit
project_merge_request_path
(
mr
.
project
,
mr
)
visit
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
end
And
'I click on the first commit in the merge request'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-05"
)
click_link
m
r
.
commits
.
first
.
short_id
(
8
)
click_link
m
erge_request
.
commits
.
first
.
short_id
(
8
)
end
And
'I leave a comment on the diff page'
do
...
...
@@ -121,8 +116,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
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_commit
=
merge_request
.
commits
.
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"
...
...
@@ -130,8 +124,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
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_commit
=
merge_request
.
commits
.
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
)
...
...
@@ -140,12 +133,19 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
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_commit
=
merge_request
.
st_commits
.
first
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
have_content
"
#{
first_diff
.
b_path
}
:L185"
end
def
project
@project
||=
Project
.
find_by_name!
(
"Shop"
)
end
def
merge_request
@merge_request
||=
MergeRequest
.
find_by_title!
(
"Bug NS-05"
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录