1 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index a06e64fdee0..22d7ff91d41 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'Milestones sorting', :js do
     sign_in(user)
   end
 
-  it 'visit group milestones and sort by due_date_asc' do
+  it 'visit group milestones and sort by due_date_asc', :js do
     visit group_milestones_path(group)
 
     expect(page).to have_button('Due soon')
@@ -27,13 +27,13 @@ RSpec.describe 'Milestones sorting', :js 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
 
-    click_button 'Due soon'
+    within '[data-testid=milestone_sort_by_dropdown]' do
+      click_button 'Due soon'
+      expect(find('.gl-new-dropdown-contents').all('.gl-new-dropdown-item-text-wrapper p').map(&:text)).to eq(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
 
-    expect(find('ul.dropdown-menu-sort li').all('a').map(&:text)).to eq(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
-
-    click_link 'Due later'
-
-    expect(page).to have_button('Due later')
+      click_button 'Due later'
+      expect(page).to have_button('Due later')
+    end
 
     # assert descending sorting
     within '.milestones' do