Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/lib/gitlab/json_logger_spec.rb b/spec/lib/gitlab/json_logger_spec.rb
index 23f7191454a..801de357ddc 100644
--- a/spec/lib/gitlab/json_logger_spec.rb
+++ b/spec/lib/gitlab/json_logger_spec.rb
@@ -7,6 +7,26 @@ RSpec.describe Gitlab::JsonLogger do
 
   let(:now) { Time.now }
 
+  describe '#file_name' do
+    let(:subclass) do
+      Class.new(Gitlab::JsonLogger) do
+        def self.file_name_noext
+          'testlogger'
+        end
+      end
+    end
+
+    it 'raises error when file_name_noext not implemented' do
+      expect { described_class.file_name }.to raise_error(
+        'JsonLogger implementations must provide file_name_noext implementation'
+      )
+    end
+
+    it 'returns log file name when file_name_noext is implemented' do
+      expect(subclass.file_name).to eq('testlogger.log')
+    end
+  end
+
   describe '#format_message' do
     before do
       allow(Labkit::Correlation::CorrelationId).to receive(:current_id).and_return('new-correlation-id')