Skip to content
代码片段 群组 项目
未验证 提交 908968b1 编辑于 作者: Jay McCure's avatar Jay McCure
浏览文件

E2E test: wait for auto-merge to dissappear

上级 da25ad6b
No related branches found
No related tags found
无相关合并请求
...@@ -408,7 +408,7 @@ def try_to_merge! ...@@ -408,7 +408,7 @@ def try_to_merge!
# Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042 # Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042
# To remove page refresh logic if possible # To remove page refresh logic if possible
wait_until_ready_to_merge wait_until_ready_to_merge
wait_until { !find_element('merge-button').text.include?('when pipeline succeeds') } # rubocop:disable Rails/NegateInclude wait_until { !find_element('merge-button').text.include?('auto-merge') } # rubocop:disable Rails/NegateInclude
click_element('merge-button') click_element('merge-button')
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册