Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/spec/lib/gitlab/app_logger_spec.rb b/spec/lib/gitlab/app_logger_spec.rb
index 66bdc204339..149c3d1f19f 100644
--- a/spec/lib/gitlab/app_logger_spec.rb
+++ b/spec/lib/gitlab/app_logger_spec.rb
@@ -2,11 +2,12 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::AppLogger do
+RSpec.describe Gitlab::AppLogger, feature_category: :shared do
   subject { described_class }
 
-  it 'logs info to only the AppJsonLogger when unstructured logs are disabled' do
-    expect_any_instance_of(Gitlab::AppTextLogger).not_to receive(:info).and_call_original
+  specify { expect(described_class.primary_logger).to be Gitlab::AppJsonLogger }
+
+  it 'logs to AppJsonLogger' do
     expect_any_instance_of(Gitlab::AppJsonLogger).to receive(:info).and_call_original
 
     subject.info('Hello World!')