From f5f5d4db9eb6f1c1bf9bf14b5143aa99db3c7ee3 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 10 Oct 2018 09:12:49 -0500 Subject: [PATCH] Fix Rails master --- test/action_controller/serialization_test.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/action_controller/serialization_test.rb b/test/action_controller/serialization_test.rb index dfd72b42..c5c7742c 100644 --- a/test/action_controller/serialization_test.rb +++ b/test/action_controller/serialization_test.rb @@ -457,13 +457,19 @@ module ActionController end def test_render_event_is_emitted - subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |name| - @name = name + subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |subscribed_event| + @subscribed_event = subscribed_event end get :render_using_implicit_serializer - assert_equal 'render.active_model_serializers', @name + subscribed_event_name = + if @subscribed_event.is_a?(String) + @subscribed_event + else + @subscribed_event.name # is a ActiveSupport::Notifications::Event + end + assert_equal 'render.active_model_serializers', subscribed_event_name ensure ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber end