Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
32b82e58
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,发现更多精彩内容 >>
提交
32b82e58
编写于
2月 06, 2017
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'merge-request-environment-list-spec' into 'master'
Added specs for merge request environment list See merge request !8937
上级
707ce837
bfd9bbba
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
15 deletion
+38
-15
spec/features/merge_requests/widget_spec.rb
spec/features/merge_requests/widget_spec.rb
+38
-15
未找到文件。
spec/features/merge_requests/widget_spec.rb
浏览文件 @
32b82e58
...
...
@@ -5,30 +5,53 @@ describe 'Merge request', :feature, :js do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
login_as
(
user
)
end
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_project_id:
project
.
id
,
target_project_id:
project
.
id
,
source_branch:
'feature'
,
target_branch:
'master'
}
)
context
'new merge request'
do
before
do
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_project_id:
project
.
id
,
target_project_id:
project
.
id
,
source_branch:
'feature'
,
target_branch:
'master'
}
)
end
it
'shows widget status after creating new merge request'
do
click_button
'Submit merge request'
expect
(
find
(
'.mr-state-widget'
)).
to
have_content
(
'Checking ability to merge automatically'
)
wait_for_ajax
expect
(
page
).
to
have_selector
(
'.accept_merge_request'
)
end
end
it
'shows widget status after creating new merge request'
do
click_button
'Submit merge request'
context
'view merge request'
do
let!
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
,
ref:
'feature'
,
sha:
merge_request
.
diff_head_sha
)
}
expect
(
find
(
'.mr-state-widget'
)).
to
have_content
(
'Checking ability to merge automatically'
)
before
do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
wait_for_ajax
it
'shows environments link'
do
wait_for_ajax
expect
(
page
).
to
have_selector
(
'.accept_merge_request'
)
page
.
within
(
'.mr-widget-heading'
)
do
expect
(
page
).
to
have_content
(
"Deployed to
#{
environment
.
name
}
"
)
expect
(
find
(
'.js-environment-link'
)[
:href
]).
to
include
(
environment
.
formatted_external_url
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录