diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 09:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 09:08:52 +0300 |
commit | 817adcd0d02e4ecbfa5e317703f7909384d1b8af (patch) | |
tree | 7705622529c5cf54cd75072f7d602b1ca4f077f2 /spec/initializers/lograge_spec.rb | |
parent | 2c505d2a49e04506e30266c05e84d68971f87502 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/lograge_spec.rb')
-rw-r--r-- | spec/initializers/lograge_spec.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/initializers/lograge_spec.rb b/spec/initializers/lograge_spec.rb index f283ac100a9..9e5eab4fc6b 100644 --- a/spec/initializers/lograge_spec.rb +++ b/spec/initializers/lograge_spec.rb @@ -99,6 +99,8 @@ describe 'lograge', type: :request do end context 'with a log subscriber' do + include_context 'parsed logs' + let(:subscriber) { Lograge::LogSubscribers::ActionController.new } let(:event) do @@ -119,16 +121,6 @@ describe 'lograge', type: :request do ) end - let(:log_output) { StringIO.new } - let(:logger) do - Logger.new(log_output).tap { |logger| logger.formatter = ->(_, _, _, msg) { msg } } - end - let(:log_data) { Gitlab::Json.parse(log_output.string) } - - before do - Lograge.logger = logger - end - describe 'with an exception' do let(:exception) { RuntimeError.new('bad request') } let(:backtrace) { caller } |