diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-15 03:07:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-15 03:07:23 +0300 |
commit | afd8f58f2d0d42d21496fe4652c1664add9b68b7 (patch) | |
tree | 38741f62cac6fafb42d30632596db951ec955850 /qa | |
parent | beabc7d164276a8bb35c2b497a0c4dc0dc824e3c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/mobile/page/project/issue/show.rb | 6 | ||||
-rw-r--r-- | qa/qa/page/component/issuable/common.rb | 4 | ||||
-rw-r--r-- | qa/qa/page/component/issuable/sidebar.rb | 8 | ||||
-rw-r--r-- | qa/qa/page/component/note.rb | 2 | ||||
-rw-r--r-- | qa/qa/page/project/issue/show.rb | 16 |
5 files changed, 16 insertions, 20 deletions
diff --git a/qa/qa/mobile/page/project/issue/show.rb b/qa/qa/mobile/page/project/issue/show.rb index df96a318806..4184c9871cc 100644 --- a/qa/qa/mobile/page/project/issue/show.rb +++ b/qa/qa/mobile/page/project/issue/show.rb @@ -13,7 +13,7 @@ module QA base.class_eval do view 'app/assets/javascripts/issues/show/components/header_actions.vue' do - element :issue_actions_dropdown + element :mobile_dropdown element :mobile_close_issue_button element :mobile_reopen_issue_button end @@ -21,12 +21,12 @@ module QA end def click_close_issue_button - find('[data-qa-selector="issue_actions_dropdown"] > button').click + find('[data-testid="mobile-dropdown"] > button').click find_element(:mobile_close_issue_button, visible: false).click end def has_reopen_issue_button? - find('[data-qa-selector="issue_actions_dropdown"] > button').click + find('[data-testid="mobile-dropdown"] > button').click has_element?(:mobile_reopen_issue_button) end end diff --git a/qa/qa/page/component/issuable/common.rb b/qa/qa/page/component/issuable/common.rb index 768a15a4551..2f116822a12 100644 --- a/qa/qa/page/component/issuable/common.rb +++ b/qa/qa/page/component/issuable/common.rb @@ -10,8 +10,8 @@ module QA def self.included(base) super - base.view 'app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue' do - element :title_content, required: true + base.view 'app/assets/javascripts/issues/show/components/title.vue' do + element :issue_title, required: true end end end diff --git a/qa/qa/page/component/issuable/sidebar.rb b/qa/qa/page/component/issuable/sidebar.rb index 0a31dee2b4f..06a3c6a8845 100644 --- a/qa/qa/page/component/issuable/sidebar.rb +++ b/qa/qa/page/component/issuable/sidebar.rb @@ -49,7 +49,7 @@ module QA end base.view 'app/assets/javascripts/sidebar/components/sidebar_editable_item.vue' do - element :edit_link + element :edit_button end base.view 'app/helpers/dropdowns_helper.rb' do @@ -59,7 +59,7 @@ module QA def assign_milestone(milestone) wait_milestone_block_finish_loading do - click_element(:edit_link) + click_element(:edit_button) click_on(milestone.title) end @@ -134,7 +134,7 @@ module QA def select_labels(labels) within_element(:labels_block) do - click_element(:edit_link) + click_element(:edit_button) labels.each do |label| within_element(:labels_dropdown_content) do @@ -144,7 +144,7 @@ module QA end end - click_element(:title_content) # to blur dropdown + click_element(:issue_title) # to blur dropdown end def toggle_more_assignees_link diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb index db9492ea516..84cc481945f 100644 --- a/qa/qa/page/component/note.rb +++ b/qa/qa/page/component/note.rb @@ -168,7 +168,7 @@ module QA def select_filter_with_text(text) retry_on_exception do - click_element(:title_content) + click_element(:issue_title) click_element :discussion_preferences_dropdown find_element(:filter_menu_item, text: text).click diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 05f38968718..43d32921ee0 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -8,6 +8,7 @@ module QA include Page::Component::Note include Page::Component::DesignManagement include Page::Component::Issuable::Sidebar + include Page::Component::Issuable::Common # We need to check phone_layout? instead of mobile_layout? here # since tablets have the regular top navigation bar prepend Mobile::Page::Project::Issue::Show if Runtime::Env.phone_layout? @@ -17,16 +18,11 @@ module QA end view 'app/assets/javascripts/issues/show/components/header_actions.vue' do - element :close_issue_button - element :reopen_issue_button - element :issue_actions_ellipsis_dropdown + element :toggle_issue_state_button + element :desktop_dropdown element :delete_issue_button end - view 'app/assets/javascripts/issues/show/components/title.vue' do - element :title_content, required: true - end - view 'app/assets/javascripts/related_issues/components/add_issuable_form.vue' do element :add_issue_button end @@ -69,18 +65,18 @@ module QA # Click by JS is needed to bypass the Moved MR actions popover # Change back to regular click_element when moved_mr_sidebar FF is removed # Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/385460 - click_by_javascript(find_element(:close_issue_button)) + click_by_javascript(find_element(:toggle_issue_state_button, text: 'Close issue')) end def has_reopen_issue_button? - has_element?(:reopen_issue_button) + has_element?(:toggle_issue_state_button, text: 'Reopen issue') end def has_delete_issue_button? # Click by JS is needed to bypass the Moved MR actions popover # Change back to regular click_element when moved_mr_sidebar FF is removed # Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/385460 - click_by_javascript(find('[data-qa-selector="issue_actions_ellipsis_dropdown"] > button')) + click_by_javascript(find('[data-testid="desktop-dropdown"] > button')) has_element?(:delete_issue_button) end |