From 84c3b11491abf4995c7279b44156797227f1f989 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Sun, 8 Nov 2015 19:43:10 -0600 Subject: [PATCH] Use null logger in test; keep track of original logger --- test/logger_test.rb | 2 +- test/test_helper.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/logger_test.rb b/test/logger_test.rb index d324570a..9e4853ba 100644 --- a/test/logger_test.rb +++ b/test/logger_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class ActiveModelSerializers::LoggerTest < Minitest::Test def test_logger_is_set_to_action_controller_logger_when_initializer_runs - assert_equal ActiveModelSerializers.logger, ActionController::Base.logger + assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars end def test_logger_can_be_set diff --git a/test/test_helper.rb b/test/test_helper.rb index dc466864..f36bd42f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -63,3 +63,8 @@ require 'support/serialization_testing' require 'fixtures/active_record' require 'fixtures/poro' + +ActiveSupport.on_load(:active_model_serializers) do + $action_controller_logger = ActiveModelSerializers.logger # rubocop:disable Style/GlobalVars + ActiveModelSerializers.logger = Logger.new(IO::NULL) +end