1 files changed, 7 insertions, 16 deletions

diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index e749c555dcf..fe591d7fe3a 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -140,14 +140,10 @@ RSpec.describe 'New/edit issue', :js do
       end
       expect(find('a', text: 'Assign to me', visible: false)).not_to be_visible
 
-      click_button 'Milestone'
-      page.within '.issue-milestone' do
-        click_link milestone.title
-      end
+      click_button 'Select milestone'
+      click_button milestone.title
       expect(find('input[name="issue[milestone_id]"]', visible: false).value).to match(milestone.id.to_s)
-      page.within '.js-milestone-select' do
-        expect(page).to have_content milestone.title
-      end
+      expect(page).to have_button milestone.title
 
       click_button 'Labels'
       page.within '.dropdown-menu-labels' do
@@ -307,14 +303,11 @@ RSpec.describe 'New/edit issue', :js do
       end
 
       it 'escapes milestone' do
-        click_button 'Milestone'
+        click_button 'Select milestone'
+        click_button milestone.title
 
         page.within '.issue-milestone' do
-          click_link milestone.title
-        end
-
-        page.within '.js-milestone-select' do
-          expect(page).to have_content milestone.title
+          expect(page).to have_button milestone.title
           expect(page).not_to have_selector 'img'
         end
       end
@@ -444,9 +437,7 @@ RSpec.describe 'New/edit issue', :js do
         expect(page).to have_content user.name
       end
 
-      page.within '.js-milestone-select' do
-        expect(page).to have_content milestone.title
-      end
+      expect(page).to have_button milestone.title
 
       click_button 'Labels'
       page.within '.dropdown-menu-labels' do