diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-17 09:10:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-17 09:10:24 +0300 |
| commit | 82dd7e4df10da0e033359a0bc1fd490502081bde (patch) | |
| tree | 808d05a8f34adfe1d4d77c8a79ec5d4264cb144f /qa | |
| parent | 44e7b84fe9a1db7ed050fbc1fc37de7972c31a0f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/component/note.rb | 1 | ||||
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb index fe42e323344..638c46f228f 100644 --- a/qa/qa/page/component/note.rb +++ b/qa/qa/page/component/note.rb @@ -150,6 +150,7 @@ module QA def start_discussion(text) fill_element :comment_field, text + close_rich_text_promo_popover_if_present within_element(:comment_button) { click_button(class: 'gl-new-dropdown-toggle') } click_element :discussion_menu_item click_element :comment_button diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index b702684a48c..71c2aa2d0b3 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -368,6 +368,7 @@ module QA end def merge_immediately! + close_rich_text_promo_popover_if_present retry_until(reload: true, sleep_interval: 1, max_attempts: 12) do if has_element?(:merge_moment_dropdown) click_element(:merge_moment_dropdown, skip_finished_loading_check: true) |