Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d493c91d
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,发现更多精彩内容 >>
提交
d493c91d
编写于
6月 21, 2018
作者:
M
Michael Kozono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Log push output on exception
上级
0ea5d664
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
6 deletion
+18
-6
qa/qa/specs/features/repository/protected_branches_spec.rb
qa/qa/specs/features/repository/protected_branches_spec.rb
+18
-6
未找到文件。
qa/qa/specs/features/repository/protected_branches_spec.rb
浏览文件 @
d493c91d
...
...
@@ -13,11 +13,15 @@ module QA
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
end
after
do
after
do
|
example
|
# We need to clear localStorage because we're using it for the dropdown,
# and capybara doesn't do this for us.
# https://github.com/teamcapybara/capybara/issues/1702
Capybara
.
execute_script
'localStorage.clear()'
# In order to help diagnose a false failure
# https://gitlab.com/gitlab-org/gitlab-ce/issues/48241
log_push_output
if
example
.
exception
end
context
'when developers and maintainers are allowed to push to a protected branch'
do
...
...
@@ -27,9 +31,9 @@ module QA
expect
(
protected_branch
.
name
).
to
have_content
(
branch_name
)
expect
(
protected_branch
.
push_allowance
).
to
have_content
(
'Developers + Maintainers'
)
push
=
push_new_file
(
branch_name
)
@
push
=
push_new_file
(
branch_name
)
expect
(
push
.
output
).
to
match
(
/remote: To create a merge request for protected-branch, visit/
)
expect
(
@
push
.
output
).
to
match
(
/remote: To create a merge request for protected-branch, visit/
)
end
end
...
...
@@ -37,11 +41,11 @@ module QA
scenario
'user without push rights fails to push to the protected branch'
do
create_protected_branch
(
allow_to_push:
false
)
push
=
push_new_file
(
branch_name
)
@
push
=
push_new_file
(
branch_name
)
expect
(
push
.
output
)
expect
(
@
push
.
output
)
.
to
match
(
/remote\: GitLab\: You are not allowed to push code to protected branches on this project/
)
expect
(
push
.
output
)
expect
(
@
push
.
output
)
.
to
match
(
/\[remote rejected\]
#{
branch_name
}
->
#{
branch_name
}
\(pre-receive hook declined\)/
)
end
end
...
...
@@ -65,5 +69,13 @@ module QA
resource
.
new_branch
=
false
end
end
def
log_push_output
if
defined?
(
@push
)
filename
=
File
.
join
(
'tmp'
,
"push-output-
#{
project
.
name
}
"
)
puts
"Exception detected. Push output will be saved to
#{
filename
}
"
IO
.
binwrite
(
filename
,
@push
.
output
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录