Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 1 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
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 8f52a7541f4..1230fc76413 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -13,7 +13,6 @@ describe 'Issue Sidebar' do
   let!(:xss_label) { create(:label, project: project, title: '<script>alert("xss");</script>') }
 
   before do
-    stub_feature_flags(save_issuable_health_status: false)
     sign_in(user)
   end
 
@@ -56,6 +55,8 @@ describe 'Issue Sidebar' do
         it 'sees link to invite members' do
           page.within '.dropdown-menu-user' do
             expect(page).to have_link('Invite Members', href: project_project_members_path(project))
+            expect(page).to have_selector('[data-track-event="click_invite_members"]')
+            expect(page).to have_selector("[data-track-label='edit_assignee']")
           end
         end
       end
diff --git a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
index 27b3ff3e085..2caa5de7e3d 100644
--- a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
+++ b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
@@ -112,6 +112,8 @@ describe 'Merge request > User edits assignees sidebar', :js do
       it 'sees link to invite members' do
         page.within '.dropdown-menu-user' do
           expect(page).to have_link('Invite Members', href: project_project_members_path(project))
+          expect(page).to have_selector('[data-track-event="click_invite_members"]')
+          expect(page).to have_selector("[data-track-label='edit_assignee']")
         end
       end
     end