diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /qa/qa/page/merge_request/show.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'qa/qa/page/merge_request/show.rb')
-rw-r--r-- | qa/qa/page/merge_request/show.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 164f25389c0..ac4d38e5918 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -23,7 +23,6 @@ module QA element :merge_button element :fast_forward_message, 'Fast-forward merge without a merge commit' # rubocop:disable QA/ElementWithPattern element :merge_moment_dropdown - element :merge_when_pipeline_succeeds_option element :merge_immediately_option end @@ -178,6 +177,10 @@ module QA has_element?(:file_name_content, text: file_name) end + def has_no_file?(file_name) + has_no_element?(:file_name_content, text: file_name) + end + def has_merge_button? refresh @@ -219,6 +222,11 @@ module QA raise "Merge did not appear to be successful" unless merged? end + def merge_immediately! + click_element(:merge_moment_dropdown) + click_element(:merge_immediately_option) + end + def merged? has_element?(:merged_status_content, text: 'The changes were merged into', wait: 60) end |