summaryrefslogtreecommitdiff
path: root/qa/qa/page/merge_request/new.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-20 13:49:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-20 13:49:51 +0000
commit71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch)
tree6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /qa/qa/page/merge_request/new.rb
parenta7253423e3403b8c08f8a161e5937e1488f5f407 (diff)
downloadgitlab-ce-a36f25615e8226344d87b692ccf3e543d5d81712.tar.gz
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'qa/qa/page/merge_request/new.rb')
-rw-r--r--qa/qa/page/merge_request/new.rb8
1 files changed, 5 insertions, 3 deletions
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