Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/features/action_cable_logging_spec.rb b/spec/features/action_cable_logging_spec.rb
index ba99405a51a..ce7c0e03aad 100644
--- a/spec/features/action_cable_logging_spec.rb
+++ b/spec/features/action_cable_logging_spec.rb
@@ -33,5 +33,15 @@ RSpec.describe 'ActionCable logging', :js do
 
     gitlab_sign_in(user)
     visit project_issue_path(project, issue)
+
+    # Because there is no visual indicator for Capybara to wait on before closing the browser,
+    # we need to test an actual feature to ensure that the subscription was already established.
+
+    expect(page.find('.assignee')).to have_content 'None'
+
+    fill_in 'note[note]', with: "/assign #{user.username}"
+    click_button 'Comment'
+
+    expect(page.find('.assignee')).to have_content user.name
   end
 end