diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 21:10:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 21:10:57 +0300 |
commit | 7eeb03ce0e64c30df91665524e543fe4e611c410 (patch) | |
tree | 07cbca6dd30e8c358bca54a0494f4716ad35cd6f /qa | |
parent | d83a3edd4416e93f2815815c1be4ee0a2755a3c5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/mobile/page/project/issue/show.rb | 10 | ||||
-rw-r--r-- | qa/qa/page/component/ci_icon.rb | 2 | ||||
-rw-r--r-- | qa/qa/page/main/login.rb | 12 |
3 files changed, 6 insertions, 18 deletions
diff --git a/qa/qa/mobile/page/project/issue/show.rb b/qa/qa/mobile/page/project/issue/show.rb index 4184c9871cc..e458883d332 100644 --- a/qa/qa/mobile/page/project/issue/show.rb +++ b/qa/qa/mobile/page/project/issue/show.rb @@ -13,21 +13,21 @@ module QA base.class_eval do view 'app/assets/javascripts/issues/show/components/header_actions.vue' do - element :mobile_dropdown - element :mobile_close_issue_button - element :mobile_reopen_issue_button + element 'mobile-dropdown' + element 'mobile-close-issue-button' + element 'mobile-reopen-issue-button' end end end def click_close_issue_button find('[data-testid="mobile-dropdown"] > button').click - find_element(:mobile_close_issue_button, visible: false).click + find_element('mobile-close-issue-button', visible: false).click end def has_reopen_issue_button? find('[data-testid="mobile-dropdown"] > button').click - has_element?(:mobile_reopen_issue_button) + has_element?('mobile-reopen-issue-button') end end end diff --git a/qa/qa/page/component/ci_icon.rb b/qa/qa/page/component/ci_icon.rb index 1ddcc810f95..5b54c26fd86 100644 --- a/qa/qa/page/component/ci_icon.rb +++ b/qa/qa/page/component/ci_icon.rb @@ -33,7 +33,7 @@ module QA def self.included(base) super - base.view 'app/assets/javascripts/vue_shared/components/ci_icon.vue' do + base.view 'app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue' do element 'ci-icon-text' end end diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index f8f93d154a1..028a6d37af4 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -105,8 +105,6 @@ module QA end Page::Main::Menu.perform(&:signed_in?) - - dismiss_duo_chat_popup end # Handle request for password change @@ -253,8 +251,6 @@ module QA wait_for_gitlab_to_respond - dismiss_duo_chat_popup - return if skip_page_validation Page::Main::Menu.validate_elements_present! @@ -262,14 +258,6 @@ module QA validate_canary! end - def dismiss_duo_chat_popup - return unless has_element?('duo-chat-promo-callout-popover') - - within_element('duo-chat-promo-callout-popover') do - click_element('close-button') - end - end - def fill_in_credential(user) fill_element 'username-field', user.username fill_element 'password-field', user.password |