Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index c0f129cefc3..bbc07e91728 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe SearchHelper, feature_category: :global_search do
         expect(search_autocomplete_opts(project.name).size).to eq(1)
       end
 
-      context 'for users' do
+      shared_examples 'for users' do
         let_it_be(:another_user) { create(:user, name: 'Jane Doe') }
         let(:term) { 'jane' }
 
@@ -153,6 +153,16 @@ RSpec.describe SearchHelper, feature_category: :global_search do
         end
       end
 
+      [true, false].each do |enabled|
+        context "with feature flag autcomplete_users_use_search_service #{enabled}" do
+          before do
+            stub_feature_flags(autocomplete_users_use_search_service: enabled)
+          end
+
+          include_examples 'for users'
+        end
+      end
+
       it "includes the required project attrs" do
         project = create(:project, namespace: create(:namespace, owner: user))
         result = search_autocomplete_opts(project.name).first