1 files changed, 16 insertions, 2 deletions
diff --git a/spec/features/projects/user_sees_user_popover_spec.rb b/spec/features/projects/user_sees_user_popover_spec.rb
index fafb3773866..6197460776d 100644
--- a/spec/features/projects/user_sees_user_popover_spec.rb
+++ b/spec/features/projects/user_sees_user_popover_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe 'User sees user popover', :js do
+  include Spec::Support::Helpers::Features::NotesHelpers
+
   let_it_be(:project) { create(:project, :repository) }
   let(:user) { project.creator }
   let(:merge_request) do
@@ -17,13 +19,13 @@ describe 'User sees user popover', :js do
   subject { page }
 
   describe 'hovering over a user link in a merge request' do
+    let(:popover_selector) { '.user-popover' }
+
     before do
       visit project_merge_request_path(project, merge_request)
     end
 
     it 'displays user popover' do
-      popover_selector = '.user-popover'
-
       find('.js-user-link').hover
 
       expect(page).to have_css(popover_selector, visible: true)
@@ -32,5 +34,17 @@ describe 'User sees user popover', :js do
         expect(page).to have_content(user.name)
       end
     end
+
+    it "displays user popover in system note" do
+      add_note("/assign @#{user.username}")
+
+      wait_for_requests
+
+      find('.system-note-message .js-user-link').hover
+
+      page.within(popover_selector) do
+        expect(page).to have_content(user.name)
+      end
+    end
   end
 end