Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 15 deletions

diff --git a/spec/features/groups/labels/sort_labels_spec.rb b/spec/features/groups/labels/sort_labels_spec.rb
index c2410246fe1..e177461701e 100644
--- a/spec/features/groups/labels/sort_labels_spec.rb
+++ b/spec/features/groups/labels/sort_labels_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
+  include ListboxHelpers
+
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
@@ -28,16 +30,16 @@ RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
   it 'sorts by date' do
     click_button 'Name'
 
-    sort_options = find('ul[role="listbox"]').all('li').collect(&:text)
-
-    expect(sort_options[0]).to eq('Name')
-    expect(sort_options[1]).to eq('Name, descending')
-    expect(sort_options[2]).to eq('Last created')
-    expect(sort_options[3]).to eq('Oldest created')
-    expect(sort_options[4]).to eq('Updated date')
-    expect(sort_options[5]).to eq('Oldest updated')
+    expect_listbox_items([
+      'Name',
+      'Name, descending',
+      'Last created',
+      'Oldest created',
+      'Updated date',
+      'Oldest updated'
+    ])
 
-    find('li', text: 'Name, descending').click
+    select_listbox_item('Name, descending')
 
     # assert default sorting
     within '.other-labels' do
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index 5543938957a..0f0ecb8f5f3 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Milestones sorting', :js, feature_category: :team_planning do
+  include ListboxHelpers
+
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
   let!(:other_project) { create(:project_empty_repo, group: group) }
@@ -27,13 +29,13 @@ RSpec.describe 'Milestones sorting', :js, feature_category: :team_planning do
       expect(page.all('ul.content-list > li strong > a').map(&:text)).to eq(['v2.0', 'v2.0', 'v3.0', 'v1.0', 'v1.0'])
     end
 
-    within '[data-testid=milestone_sort_by_dropdown]' do
-      click_button 'Due soon'
-      expect(find('ul[role="listbox"]').all('li').map(&:text)).to eq(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
+    click_button 'Due soon'
 
-      find('li', text: 'Due later').click
-      expect(page).to have_button('Due later')
-    end
+    expect_listbox_items(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
+
+    select_listbox_item('Due later')
+
+    expect(page).to have_button('Due later')
 
     # assert descending sorting
     within '.milestones' do