Fix Rails master

This commit is contained in:
Benjamin Fleischer 2018-10-10 09:12:49 -05:00
parent ed97e94e71
commit f5f5d4db9e

View File

@ -457,13 +457,19 @@ module ActionController
end end
def test_render_event_is_emitted def test_render_event_is_emitted
subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |name| subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |subscribed_event|
@name = name @subscribed_event = subscribed_event
end end
get :render_using_implicit_serializer 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 ensure
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
end end