Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
492dc82c
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,发现更多精彩内容 >>
提交
492dc82c
编写于
3月 19, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6557 from tsigo/faster-merge-request-features
Speed up features/notes_on_merge_requests_spec
上级
587e16a4
a90574fa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
40 deletion
+33
-40
spec/factories.rb
spec/factories.rb
+5
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+21
-28
spec/finders/merge_requests_finder_spec.rb
spec/finders/merge_requests_finder_spec.rb
+7
-11
spec/seed_project.tar.gz
spec/seed_project.tar.gz
+0
-0
未找到文件。
spec/factories.rb
浏览文件 @
492dc82c
...
...
@@ -158,6 +158,11 @@ FactoryGirl.define do
state
:reopened
end
trait
:simple
do
source_branch
"simple_merge_request"
target_branch
"master"
end
factory
:closed_merge_request
,
traits:
[
:closed
]
factory
:reopened_merge_request
,
traits:
[
:reopened
]
factory
:merge_request_with_diffs
,
traits:
[
:with_diffs
]
...
...
@@ -173,7 +178,6 @@ FactoryGirl.define do
factory
:note_on_issue
,
traits:
[
:on_issue
],
aliases:
[
:votable_note
]
factory
:note_on_merge_request
,
traits:
[
:on_merge_request
]
factory
:note_on_merge_request_diff
,
traits:
[
:on_merge_request
,
:on_diff
]
factory
:note_on_merge_request_with_attachment
,
traits:
[
:on_merge_request
,
:with_attachment
]
trait
:on_commit
do
project
factory: :project
...
...
spec/features/notes_on_merge_requests_spec.rb
浏览文件 @
492dc82c
require
'spec_helper'
describe
"On a merge request"
,
js:
true
do
let!
(
:
project
)
{
create
(
:project
)
}
let!
(
:
merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let!
(
:note
)
{
create
(
:note_on_merge_request
_with_attachment
,
project:
project
)
}
let!
(
:
merge_request
)
{
create
(
:merge_request
,
:simple
)
}
let!
(
:
project
)
{
merge_request
.
source_project
}
let!
(
:note
)
{
create
(
:note_on_merge_request
,
:with_attachment
,
project:
project
)
}
before
do
login_as
:user
project
.
team
<<
[
@user
,
:master
]
login_as
:admin
visit
project_merge_request_path
(
project
,
merge_request
)
end
...
...
@@ -134,22 +132,20 @@ describe "On a merge request", js: true do
end
end
describe
"On a merge request diff"
,
js:
true
,
focus:
true
do
let
!
(
:project
)
{
create
(
:project
)
}
let
!
(
:merge_request
)
{
create
(
:merge_request_with_diffs
,
source_project:
project
,
target_project:
project
)
}
describe
"On a merge request diff"
,
js:
true
do
let
(
:merge_request
)
{
create
(
:merge_request
,
:with_diffs
,
:simple
)
}
let
(
:project
)
{
merge_request
.
source_project
}
before
do
login_as
:user
project
.
team
<<
[
@user
,
:master
]
login_as
:admin
visit
diffs_project_merge_request_path
(
project
,
merge_request
)
end
subject
{
page
}
describe
"when adding a note"
do
before
do
find
(
'a[data-line-code="
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
"]'
).
click
find
(
'a[data-line-code="
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
"]'
).
click
end
describe
"the notes holder"
do
...
...
@@ -160,13 +156,13 @@ describe "On a merge request diff", js: true, focus: true do
describe
"the note form"
do
it
"shouldn't add a second form for same row"
do
find
(
'a[data-line-code="
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
"]'
).
click
find
(
'a[data-line-code="
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
"]'
).
click
should
have_css
(
"tr[id='
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
'] + .js-temp-notes-holder form"
,
count:
1
)
should
have_css
(
"tr[id='
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
'] + .js-temp-notes-holder form"
,
count:
1
)
end
it
"should be removed when canceled"
do
within
(
".diff-file form[rel$='
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
']"
)
do
within
(
".diff-file form[rel$='
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
']"
)
do
find
(
".js-close-discussion-note-form"
).
trigger
(
"click"
)
end
...
...
@@ -176,12 +172,9 @@ describe "On a merge request diff", js: true, focus: true do
end
describe
"with muliple note forms"
do
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:merge_request
)
{
create
(
:merge_request_with_diffs
,
source_project:
project
,
target_project:
project
)
}
before
do
find
(
'a[data-line-code="
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
"]'
).
click
find
(
'a[data-line-code="
342e16cbbd482ac2047dc679b2749d248cc1428f_18_17
"]'
).
click
find
(
'a[data-line-code="
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
"]'
).
click
find
(
'a[data-line-code="
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10
"]'
).
click
end
it
{
should
have_css
(
".js-temp-notes-holder"
,
count:
2
)
}
...
...
@@ -189,12 +182,12 @@ describe "On a merge request diff", js: true, focus: true do
describe
"previewing them separately"
do
before
do
# add two separate texts and trigger previews on both
within
(
"tr[id='
4735dfc552ad7bf15ca468adc3cad9d05b624490_172_185
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"One comment on line
185
"
within
(
"tr[id='
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"One comment on line
7
"
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
end
within
(
"tr[id='
342e16cbbd482ac2047dc679b2749d248cc1428f_18_17
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"Another comment on line 1
7
"
within
(
"tr[id='
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"Another comment on line 1
0
"
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
end
end
...
...
@@ -202,14 +195,14 @@ describe "On a merge request diff", js: true, focus: true do
describe
"posting a note"
do
before
do
within
(
"tr[id='
342e16cbbd482ac2047dc679b2749d248cc1428f_18_17
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"Another comment on line 1
7
"
within
(
"tr[id='
8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10
'] + .js-temp-notes-holder"
)
do
fill_in
"note[note]"
,
with:
"Another comment on line 1
0
"
click_button
(
"Add Comment"
)
end
end
it
'should be added as discussion'
do
should
have_content
(
"Another comment on line 1
7
"
)
should
have_content
(
"Another comment on line 1
0
"
)
should
have_css
(
".notes_holder"
)
should
have_css
(
".notes_holder .note"
,
count:
1
)
should
have_link
(
"Reply"
)
...
...
spec/finders/merge_requests_finder_spec.rb
浏览文件 @
492dc82c
require
'spec_helper'
describe
MergeRequestsFinder
do
let
(
:user
)
{
create
:user
}
let
(
:user
)
{
create
:user
}
let
(
:user2
)
{
create
:user
}
let
(
:project1
)
{
create
(
:project
)
}
let
(
:project2
)
{
create
(
:project
)
}
let
(
:merge_request1
)
{
create
(
:merge_request
,
author:
user
,
source_project:
project1
,
target_project:
project2
)
}
let
(
:merge_request2
)
{
create
(
:merge_request
,
author:
user
,
source_project:
project2
,
target_project:
project1
)
}
let
(
:merge_request3
)
{
create
(
:merge_request
,
author:
user
,
source_project:
project2
,
target_project:
project2
)
}
let!
(
:merge_request1
)
{
create
(
:merge_request
,
:simple
,
author:
user
,
source_project:
project1
,
target_project:
project2
)
}
let!
(
:merge_request2
)
{
create
(
:merge_request
,
:simple
,
author:
user
,
source_project:
project2
,
target_project:
project1
)
}
let!
(
:merge_request3
)
{
create
(
:merge_request
,
:simple
,
author:
user
,
source_project:
project2
,
target_project:
project2
)
}
before
do
project1
.
team
<<
[
user
,
:master
]
...
...
@@ -15,13 +17,7 @@ describe MergeRequestsFinder do
project2
.
team
<<
[
user2
,
:developer
]
end
describe
:execute
do
before
:each
do
merge_request1
merge_request2
merge_request3
end
describe
"#execute"
do
it
'should filter by scope'
do
params
=
{
scope:
'authored'
,
state:
'opened'
}
merge_requests
=
MergeRequestsFinder
.
new
.
execute
(
user
,
params
)
...
...
spec/seed_project.tar.gz
浏览文件 @
492dc82c
无法预览此类型文件
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录