From 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Feb 2023 13:49:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-9-stable-ee --- qa/qa/page/merge_request/new.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'qa/qa/page/merge_request/new.rb') diff --git a/qa/qa/page/merge_request/new.rb b/qa/qa/page/merge_request/new.rb index dc2f908a906..a1d91621090 100644 --- a/qa/qa/page/merge_request/new.rb +++ b/qa/qa/page/merge_request/new.rb @@ -10,7 +10,10 @@ module QA view 'app/views/projects/merge_requests/creations/_new_compare.html.haml' do element :compare_branches_button - element :source_branch_dropdown + end + + view 'app/assets/javascripts/merge_requests/components/compare_dropdown.vue' do + element :source_branch_dropdown, ':data-qa-selector="qaSelector"' # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/merge_requests/_page.html.haml' do @@ -46,8 +49,7 @@ module QA def select_source_branch(branch) click_element(:source_branch_dropdown) - fill_element(:dropdown_input_field, branch) - click_via_capybara(:click_on, branch) + search_and_select(branch) end end end -- cgit v1.2.1