Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 62966-embed-zoom-call-in-issue-mvc

4 files changed, 16 insertions, 4 deletions

diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index e75c43d5338..fb76e2b0014 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -125,7 +125,7 @@ describe 'Dashboard Groups page', :js do
     end
 
     it 'loads results for next page' do
-      expect(page).to have_selector('.gl-pagination .page-item a[role=menuitemradio]', count: 2)
+      expect(page).to have_selector('.gl-pagination .page-item a.page-link', count: 3)
 
       # Check first page
       expect(page).to have_content(group2.full_name)
@@ -134,7 +134,7 @@ describe 'Dashboard Groups page', :js do
       expect(page).not_to have_selector("#group-#{group.id}")
 
       # Go to next page
-      find('.gl-pagination .page-item:not(.active) a[role=menuitemradio]').click
+      find('.gl-pagination .page-item:last-of-type a.page-link').click
 
       wait_for_requests
 
diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb
index 042ecdb172a..94bd7c53bb5 100644
--- a/spec/features/issues/markdown_toolbar_spec.rb
+++ b/spec/features/issues/markdown_toolbar_spec.rb
@@ -32,7 +32,7 @@ describe 'Issue markdown toolbar', :js do
     find('.js-main-target-form #note-body')
     page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)')
 
-    find('.toolbar-btn:nth-child(2)').click
+    all('.toolbar-btn')[1].click
 
     expect(find('#note-body')[:value]).to eq("test\n*underline*\n")
   end
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index e5770905dbd..8ff24449b39 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -141,7 +141,7 @@ describe 'Merge request > User posts notes', :js do
 
         page.within('.current-note-edit-form') do
           expect(find('#note_note').value).to eq('This is the new content')
-          find('.js-md:first-child').click
+          first('.js-md').click
           expect(find('#note_note').value).to eq('This is the new content****')
         end
       end
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 780de76d2c5..e8b4fc8f160 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -28,6 +28,18 @@ describe 'User comments on a diff', :js do
   end
 
   context 'single suggestion note' do
+    it 'hides suggestion popover' do
+      click_diff_line(find("[id='#{sample_compare.changes[1][:line_code]}']"))
+
+      expect(page).to have_selector('.diff-suggest-popover')
+
+      page.within('.diff-suggest-popover') do
+        click_button 'Got it'
+      end
+
+      expect(page).not_to have_selector('.diff-suggest-popover')
+    end
+
     it 'suggestion is presented' do
       click_diff_line(find("[id='#{sample_compare.changes[1][:line_code]}']"))