Merge branch 'fix-flash-message-for-anonymous-search' into 'master'

Fix flash message for anonymous search

See merge request gitlab-org/gitlab!70453

app/controllers/concerns/issuable_collections.rb

@@ -16,7 +16,7 @@ module IssuableCollections
   def show_alert_if_search_is_disabled
     return if current_user || params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_search, type: :ops)
 
-    flash[:notice] = _('You must sign in to search for specific terms.')
+    flash.now[:notice] = _('You must sign in to search for specific terms.')
   end
 
   # rubocop:disable Gitlab/ModuleWithInstanceVariables

app/controllers/explore/projects_controller.rb

@@ -125,7 +125,7 @@ class Explore::ProjectsController < Explore::ApplicationController
   def show_alert_if_search_is_disabled
     return if current_user || params[:name].blank? && params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_project_search, type: :ops)
 
-    flash[:notice] = _('You must sign in to search for specific projects.')
+    flash.now[:notice] = _('You must sign in to search for specific projects.')
   end
 end
 

spec/controllers/explore/projects_controller_spec.rb

@@ -214,7 +214,7 @@ RSpec.describe Explore::ProjectsController do
           sign_in(create(:user))
           get controller_action, params: params_with_name
 
-          expect(flash[:notice]).to be_nil
+          expect(flash.now[:notice]).to be_nil
         end
       end
     end
@@ -260,14 +260,14 @@ RSpec.describe Explore::ProjectsController do
         it 'shows a flash message' do
           get controller_action, params: params_with_name
 
-          expect(flash[:notice]).to eq('You must sign in to search for specific projects.')
+          expect(flash.now[:notice]).to eq('You must sign in to search for specific projects.')
         end
 
         context 'when search param is not given' do
           it 'does not show a flash message' do
             get controller_action
 
-            expect(flash[:notice]).to be_nil
+            expect(flash.now[:notice]).to be_nil
           end
         end
 
@@ -275,7 +275,7 @@ RSpec.describe Explore::ProjectsController do
           it 'does not show a flash message' do
             get controller_action, params: params_with_name.merge(format: :atom)
 
-            expect(flash[:notice]).to be_nil
+            expect(flash.now[:notice]).to be_nil
           end
         end
       end
@@ -288,7 +288,7 @@ RSpec.describe Explore::ProjectsController do
         it 'does not show a flash message' do
           get controller_action, params: params_with_name
 
-          expect(flash[:notice]).to be_nil
+          expect(flash.now[:notice]).to be_nil
         end
       end
     end

spec/support/shared_examples/controllers/issuable_anonymous_search_disabled_examples.rb

@@ -12,14 +12,14 @@ RSpec.shared_examples 'issuable list with anonymous search disabled' do |action|
     it 'shows a flash message' do
       get controller_action, params: params_with_search
 
-      expect(flash[:notice]).to eq('You must sign in to search for specific terms.')
+      expect(flash.now[:notice]).to eq('You must sign in to search for specific terms.')
     end
 
     context 'when search param is not given' do
       it 'does not show a flash message' do
         get controller_action, params: params
 
-        expect(flash[:notice]).to be_nil
+        expect(flash.now[:notice]).to be_nil
       end
     end
 
@@ -28,7 +28,7 @@ RSpec.shared_examples 'issuable list with anonymous search disabled' do |action|
         sign_in(create(:user))
         get controller_action, params: params_with_search
 
-        expect(flash[:notice]).to be_nil
+        expect(flash.now[:notice]).to be_nil
       end
     end
 
@@ -36,7 +36,7 @@ RSpec.shared_examples 'issuable list with anonymous search disabled' do |action|
       it 'does not show a flash message' do
         get controller_action, params: params_with_search.merge(format: :atom)
 
-        expect(flash[:notice]).to be_nil
+        expect(flash.now[:notice]).to be_nil
       end
     end
   end
@@ -49,7 +49,7 @@ RSpec.shared_examples 'issuable list with anonymous search disabled' do |action|
     it 'does not show a flash message' do
       get controller_action, params: params_with_search
 
-      expect(flash[:notice]).to be_nil
+      expect(flash.now[:notice]).to be_nil
     end
   end
 end