From 36a59d088eca61b834191dacea009677a96c052f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 May 2022 07:33:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-0-stable-ee --- qa/qa/page/component/blob_content.rb | 11 +++++++++++ qa/qa/page/component/new_snippet.rb | 3 +-- qa/qa/page/component/snippet.rb | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'qa/qa/page/component') diff --git a/qa/qa/page/component/blob_content.rb b/qa/qa/page/component/blob_content.rb index ce743b24dda..c2a1687ccfc 100644 --- a/qa/qa/page/component/blob_content.rb +++ b/qa/qa/page/component/blob_content.rb @@ -63,6 +63,17 @@ module QA end end + def has_normalized_ws_text?(text, wait: Capybara.default_max_wait_time) + if has_element?(:blob_viewer_file_content, wait: 1) + # The blob viewer renders line numbers and whitespace in a way that doesn't match the source file + # This isn't a visual validation test, so we ignore line numbers and whitespace + find_element(:blob_viewer_file_content, wait: 0).text.gsub(/^\d+\s|\s*/, '') + .start_with?(text.gsub(/\s*/, '')) + else + has_text?(text.gsub(/\s+/, " "), wait: wait) + end + end + def click_copy_file_contents(file_number = nil) within_file_by_number(:default_actions_container, file_number) { click_element(:copy_contents_button) } end diff --git a/qa/qa/page/component/new_snippet.rb b/qa/qa/page/component/new_snippet.rb index 6ccf8a4043e..9c4408e36e4 100644 --- a/qa/qa/page/component/new_snippet.rb +++ b/qa/qa/page/component/new_snippet.rb @@ -76,8 +76,7 @@ module QA end def click_create_snippet_button - wait_until(reload: false) { !find_element(:submit_button).disabled? } - click_element(:submit_button) + click_element_coordinates(:submit_button) wait_until(reload: false) do has_no_element?(:snippet_title_field) end diff --git a/qa/qa/page/component/snippet.rb b/qa/qa/page/component/snippet.rb index a8ae706858e..47d32ae8225 100644 --- a/qa/qa/page/component/snippet.rb +++ b/qa/qa/page/component/snippet.rb @@ -82,7 +82,7 @@ module QA base.view 'app/views/layouts/nav/_breadcrumbs.html.haml' do element :breadcrumb_links_content - element :breadcrumb_sub_title_content + element :breadcrumb_current_link end end @@ -257,7 +257,7 @@ module QA def snippet_id within_element(:breadcrumb_links_content) do - find_element(:breadcrumb_sub_title_content).text.delete_prefix('$') + find_element(:breadcrumb_current_link).text.delete_prefix('$') end end end -- cgit v1.2.1