Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 728ba07e5c4..58c84d26fea 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -185,7 +185,7 @@ RSpec.describe 'GFM autocomplete', :js, feature_category: :team_planning do
       end
     end
 
-    describe 'assignees' do
+    shared_examples 'autocomplete user mentions' do
       it 'does not wrap with quotes for assignee values' do
         fill_in 'Comment', with: "@#{user.username}"
 
@@ -252,6 +252,16 @@ RSpec.describe 'GFM autocomplete', :js, feature_category: :team_planning do
       end
     end
 
+    it_behaves_like 'autocomplete user mentions'
+
+    context 'when mention_autocomplete_backend_filtering is disabled' do
+      before do
+        stub_feature_flags(mention_autocomplete_backend_filtering: false)
+      end
+
+      it_behaves_like 'autocomplete user mentions'
+    end
+
     context 'if a selected value has special characters' do
       it 'wraps the result in double quotes' do
         fill_in 'Comment', with: "~#{label.title[0..2]}"