Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
fa79eefd
未验证
提交
fa79eefd
编辑于
1 year ago
作者:
Jay McCure
浏览文件
操作
下载
补丁
差异文件
E2E tests: wait for MRs to be prepared
上级
83deec34
No related branches found
No related tags found
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
qa/qa/resource/merge_request.rb
+16
-1
16 个添加, 1 个删除
qa/qa/resource/merge_request.rb
qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb
+1
-2
1 个添加, 2 个删除
...browser_ui/3_create/repository/assign_code_owners_spec.rb
有
17 个添加
和
3 个删除
qa/qa/resource/merge_request.rb
+
16
−
1
浏览文件 @
fa79eefd
...
@@ -25,6 +25,7 @@ class MergeRequest < Issuable
...
@@ -25,6 +25,7 @@ class MergeRequest < Issuable
:description
,
:description
,
:merge_when_pipeline_succeeds
,
:merge_when_pipeline_succeeds
,
:detailed_merge_status
,
:detailed_merge_status
,
:prepared_at
,
:state
,
:state
,
:reviewers
:reviewers
...
@@ -110,7 +111,9 @@ def fabricate_via_api!
...
@@ -110,7 +111,9 @@ def fabricate_via_api!
rescue
ResourceNotFoundError
,
NoValueError
# rescue if iid not populated
rescue
ResourceNotFoundError
,
NoValueError
# rescue if iid not populated
populate_target_and_source_if_required
populate_target_and_source_if_required
super
url
=
super
wait_for_preparation
url
end
end
def
api_merge_path
def
api_merge_path
...
@@ -265,6 +268,18 @@ def wait_until_mergable
...
@@ -265,6 +268,18 @@ def wait_until_mergable
raise
Support
::
Repeater
::
WaitExceededError
,
raise
Support
::
Repeater
::
WaitExceededError
,
"Timed out waiting for merge of MR with id '
#{
iid
}
'. Final status was '
#{
detailed_merge_status
}
'"
"Timed out waiting for merge of MR with id '
#{
iid
}
'. Final status was '
#{
detailed_merge_status
}
'"
end
end
# Wait until the merge request is prepared. Raises WaitExceededError if the MR is not prepared within 60 seconds
# https://docs.gitlab.com/ee/api/merge_requests.html#preparation-steps
#
# @return [void]
def
wait_for_preparation
return
if
Support
::
Waiter
.
wait_until
(
sleep_interval:
1
,
raise_on_failure:
false
,
log:
false
)
do
reload!
.
prepared_at
end
raise
Support
::
Repeater
::
WaitExceededError
,
"Timed out waiting for MR with id '
#{
iid
}
' to be prepared."
end
end
end
end
end
end
end
此差异已折叠。
点击以展开。
qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb
+
1
−
2
浏览文件 @
fa79eefd
...
@@ -26,8 +26,7 @@ module QA
...
@@ -26,8 +26,7 @@ module QA
end
end
it
'merge request assigns code owners as approvers'
,
it
'merge request assigns code owners as approvers'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347776'
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347776'
do
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/416217'
,
type: :bug
}
do
# Commit CODEOWNERS to default branch
# Commit CODEOWNERS to default branch
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
project
=
project
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录