Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 3 deletions

diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 62e8c600e9f..dddefbac163 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -1010,7 +1010,7 @@ RSpec.describe Projects::EnvironmentsController do
         expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
           method.call(payload)
 
-          expect(payload[:metadata]['meta.environment.search']).to be_nil
+          expect(payload[:metadata]).not_to have_key('meta.environment.search')
           expect(payload[:action]).to eq("search")
           expect(payload[:controller]).to eq("Projects::EnvironmentsController")
         end
@@ -1022,13 +1022,25 @@ RSpec.describe Projects::EnvironmentsController do
         expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
           method.call(payload)
 
-          expect(payload[:metadata]['meta.environment.search']).to be_nil
+          expect(payload[:metadata]).not_to have_key('meta.environment.search')
           expect(payload[:action]).to eq("search")
           expect(payload[:controller]).to eq("Projects::EnvironmentsController")
         end
 
         get :search, params: environment_params(format: :json)
       end
+
+      it 'logs params correctly when search params is empty string' do
+        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
+          method.call(payload)
+
+          expect(payload[:metadata]).not_to have_key('meta.environment.search')
+          expect(payload[:action]).to eq("search")
+          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
+        end
+
+        get :search, params: environment_params(format: :json, search: "")
+      end
     end
 
     context 'when search_environment_logging feature is enabled' do
@@ -1052,13 +1064,25 @@ RSpec.describe Projects::EnvironmentsController do
         expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
           method.call(payload)
 
-          expect(payload[:metadata]['meta.environment.search']).to be_nil
+          expect(payload[:metadata]).not_to have_key('meta.environment.search')
           expect(payload[:action]).to eq("search")
           expect(payload[:controller]).to eq("Projects::EnvironmentsController")
         end
 
         get :search, params: environment_params(format: :json)
       end
+
+      it 'logs params correctly when search params is empty string' do
+        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
+          method.call(payload)
+
+          expect(payload[:metadata]).not_to have_key('meta.environment.search')
+          expect(payload[:action]).to eq("search")
+          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
+        end
+
+        get :search, params: environment_params(format: :json, search: "")
+      end
     end
   end