Merge pull request #1322 from bf4/maurogeorge-patch-10

Instrumenting rendering of resources
This commit is contained in:
Benjamin Fleischer
2015-11-19 13:01:38 -06:00
15 changed files with 340 additions and 9 deletions

View File

@@ -54,6 +54,7 @@ else
end
require 'active_model_serializers'
require 'active_model/serializer/railtie'
require 'support/stream_capture'
@@ -66,3 +67,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