Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/serializers/environment_entity_spec.rb b/spec/serializers/environment_entity_spec.rb
index a59107ad309..9b6a293da16 100644
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
@@ -166,6 +166,18 @@ RSpec.describe EnvironmentEntity do
 
         expect(subject[:logs_api_path]).to eq(elasticsearch_project_logs_path(project, environment_name: environment.name, format: :json))
       end
+
+      context 'with feature flag disabled' do
+        before do
+          stub_feature_flags(monitor_logging: false)
+        end
+
+        it 'does not expose logs keys' do
+          expect(subject).not_to include(:logs_path)
+          expect(subject).not_to include(:logs_api_path)
+          expect(subject).not_to include(:enable_advanced_logs_querying)
+        end
+      end
     end
   end