Add latest changes from gitlab-org/gitlab@master

4 files changed, 24 insertions, 23 deletions

diff --git a/qa/qa/page/component/members/members_table.rb b/qa/qa/page/component/members/members_table.rb
index 655a28f947e..7d6431d7b32 100644
--- a/qa/qa/page/component/members/members_table.rb
+++ b/qa/qa/page/component/members/members_table.rb
@@ -18,12 +18,12 @@ module QA
             end
 
             base.view 'app/assets/javascripts/members/components/table/members_table.vue' do
-              element :member_row
+              element 'members-table'
             end
 
             base.view 'app/assets/javascripts/members/components/table/max_role.vue' do
-              element :access_level_dropdown
-              element :access_level_link
+              element 'access-level-dropdown'
+              element 'access-level-link'
             end
 
             base.view 'app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue' do
@@ -43,23 +43,23 @@ module QA
             end
 
             base.view 'app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue' do
-              element :remove_group_link_button
+              element('remove-group-link-button')
             end
           end
 
           def update_access_level(username, access_level)
             search_member(username)
 
-            within_element(:member_row, text: username) do
-              click_element :access_level_dropdown
-              click_element :access_level_link, text: access_level
+            within_element('members-table', text: username) do
+              click_element('access-level-dropdown')
+              click_element('access-level-link', text: access_level)
             end
 
             click_confirmation_ok_button_if_present
           end
 
           def remove_member(username)
-            within_element(:member_row, text: username) do
+            within_element('members-table', text: username) do
               click_element 'user-action-dropdown'
               click_element 'delete-member-dropdown-item'
             end
@@ -68,13 +68,13 @@ module QA
           end
 
           def approve_access_request(username)
-            within_element(:member_row, text: username) do
+            within_element('members-table', text: username) do
               click_element 'approve-access-request-button'
             end
           end
 
           def deny_access_request(username)
-            within_element(:member_row, text: username) do
+            within_element('members-table', text: username) do
               click_element 'delete-member-button'
             end
 
@@ -84,8 +84,8 @@ module QA
           def remove_group(group_name)
             click_element 'groups-list-tab'
 
-            within_element(:member_row, text: group_name) do
-              click_element :remove_group_link_button
+            within_element('members-table', text: group_name) do
+              click_element('remove-group-link-button')
             end
 
             confirm_remove_group
@@ -93,7 +93,7 @@ module QA
 
           def has_group?(group_name)
             click_element 'groups-list-tab'
-            has_element?(:member_row, text: group_name)
+            has_element?('members-table', text: group_name)
           end
         end
       end
diff --git a/qa/qa/page/component/members/remove_group_modal.rb b/qa/qa/page/component/members/remove_group_modal.rb
index 03c51757b62..b2be79604b6 100644
--- a/qa/qa/page/component/members/remove_group_modal.rb
+++ b/qa/qa/page/component/members/remove_group_modal.rb
@@ -11,16 +11,16 @@ module QA
             super
 
             base.view 'app/assets/javascripts/members/components/modals/remove_group_link_modal.vue' do
-              element :remove_group_link_modal_content
-              element :remove_group_button
+              element('remove-group-link-modal-content')
+              element('remove-group-button')
             end
           end
 
           def confirm_remove_group
-            within_element(:remove_group_link_modal_content) do
+            within_element('remove-group-link-modal-content') do
               wait_for_enabled_remove_group_button
 
-              click_element :remove_group_button
+              click_element('remove-group-button')
             end
           end
 
@@ -28,7 +28,7 @@ module QA
 
           def wait_for_enabled_remove_group_button
             retry_until(sleep_interval: 1, message: 'Waiting for remove group button to be enabled') do
-              has_element?(:remove_group_button, disabled: false, wait: 3)
+              has_element?('remove-group-button', disabled: false, wait: 3)
             end
           end
         end
diff --git a/qa/qa/page/component/members/remove_member_modal.rb b/qa/qa/page/component/members/remove_member_modal.rb
index b7b81040ba7..414e1ba5b08 100644
--- a/qa/qa/page/component/members/remove_member_modal.rb
+++ b/qa/qa/page/component/members/remove_member_modal.rb
@@ -11,16 +11,16 @@ module QA
             super
 
             base.view 'app/assets/javascripts/members/components/modals/remove_member_modal.vue' do
-              element :remove_member_modal
-              element :remove_member_button
+              element 'remove-member-modal'
+              element 'remove-member-button'
             end
           end
 
           def confirm_remove_member
-            within_element(:remove_member_modal) do
+            within_element('remove-member-modal') do
               wait_for_enabled_remove_member_button
 
-              click_element :remove_member_button
+              click_element('remove-member-button')
             end
           end
 
@@ -28,7 +28,7 @@ module QA
 
           def wait_for_enabled_remove_member_button
             retry_until(sleep_interval: 1, message: 'Waiting for remove member button to be enabled') do
-              has_element?(:remove_member_button, disabled: false, wait: 3)
+              has_element?('remove-member-button', disabled: false, wait: 3)
             end
           end
         end
diff --git a/qa/qa/tools/reliable_report.rb b/qa/qa/tools/reliable_report.rb
index 96e9d53cac3..7569095b56f 100644
--- a/qa/qa/tools/reliable_report.rb
+++ b/qa/qa/tools/reliable_report.rb
@@ -31,6 +31,7 @@ module QA
       PROJECT_ID = 278964
       FEATURES_DIR = 'https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/qa/specs/features/'
 
+      # @param [Integer] range amount of days for results range
       def initialize(range)
         @range = range.to_i
         @slack_channel = "#quality-reports"