1 files changed, 15 insertions, 12 deletions

diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index fa72acad8c6..686074f7412 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
   include MobileHelpers
+  include Spec::Support::Helpers::Features::InviteMembersModalHelper
 
   let_it_be(:group) { create(:group, :nested) }
   let_it_be(:project) { create(:project, :public, namespace: group) }
@@ -120,11 +121,13 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
               expect(page).to have_link('Invite members')
               expect(page).to have_selector('[data-track-action="click_invite_members"]')
               expect(page).to have_selector('[data-track-label="edit_assignee"]')
-            end
 
-            click_link 'Invite members'
+              click_link 'Invite members'
+            end
 
-            expect(page).to have_content("You're inviting members to the")
+            page.within invite_modal_selector do
+              expect(page).to have_content("You're inviting members to the #{project.name} project")
+            end
           end
         end
 
@@ -208,7 +211,7 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
         visit_issue(project, issue)
       end
 
-      context 'sidebar', :js do
+      context 'for sidebar', :js do
         it 'changes size when the screen size is smaller' do
           sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed'
           # Resize the window
@@ -227,25 +230,25 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
         end
       end
 
-      context 'editing issue milestone', :js do
+      context 'for editing issue milestone', :js do
         it_behaves_like 'milestone sidebar widget'
       end
 
-      context 'editing issue due date', :js do
+      context 'for editing issue due date', :js do
         it_behaves_like 'date sidebar widget'
       end
 
-      context 'editing issue labels', :js do
+      context 'for editing issue labels', :js do
         it_behaves_like 'labels sidebar widget'
       end
 
-      context 'escalation status', :js do
+      context 'for escalation status', :js do
         it 'is not available for default issue type' do
           expect(page).not_to have_selector('.block.escalation-status')
         end
       end
 
-      context 'interacting with collapsed sidebar', :js do
+      context 'when interacting with collapsed sidebar', :js do
         collapsed_sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed'
         expanded_sidebar_selector = 'aside.right-sidebar.right-sidebar-expanded'
         confidentiality_sidebar_block = '.block.confidentiality'
@@ -300,7 +303,7 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
         expect(page).not_to have_selector('.block.labels .js-sidebar-dropdown-toggle')
       end
 
-      context 'sidebar', :js do
+      context 'for sidebar', :js do
         it 'finds issue copy forwarding email' do
           expect(
             find('[data-testid="copy-forward-email"]').text
@@ -308,7 +311,7 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
         end
       end
 
-      context 'interacting with collapsed sidebar', :js do
+      context 'when interacting with collapsed sidebar', :js do
         collapsed_sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed'
         expanded_sidebar_selector = 'aside.right-sidebar.right-sidebar-expanded'
         lock_sidebar_block = '.block.lock'
@@ -334,7 +337,7 @@ RSpec.describe 'Issue Sidebar', feature_category: :team_planning do
   end
 
   context 'when not signed in' do
-    context 'sidebar', :js do
+    context 'for sidebar', :js do
       before do
         visit_issue(project, issue)
       end