Fix Rails master

Author: bf4

test/action_controller/serialization_test.rb

@@ -457,13 +457,19 @@ def use_adapter?
       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