diff --git a/lib/action_controller/serialization_test_case.rb b/lib/action_controller/serialization_test_case.rb index 37c882b5..4d6352ed 100644 --- a/lib/action_controller/serialization_test_case.rb +++ b/lib/action_controller/serialization_test_case.rb @@ -3,11 +3,11 @@ module ActionController extend ActiveSupport::Concern included do - setup :setup_subscriptions - teardown :teardown_subscriptions + setup :setup_serialization_subscriptions + teardown :teardown_serialization_subscriptions end - def setup_subscriptions + def setup_serialization_subscriptions @serializers = Hash.new(0) ActiveSupport::Notifications.subscribe("!serialize.active_model_serializers") do |name, start, finish, id, payload| @@ -16,7 +16,7 @@ module ActionController end end - def teardown_subscriptions + def teardown_serialization_subscriptions ActiveSupport::Notifications.unsubscribe("!serialize.active_model_serializers") end diff --git a/test/fixtures/template.html.erb b/test/fixtures/template.html.erb new file mode 100644 index 00000000..1f87be87 --- /dev/null +++ b/test/fixtures/template.html.erb @@ -0,0 +1 @@ +

Hello.

diff --git a/test/integration/action_controller/serialization_test_case_test.rb b/test/integration/action_controller/serialization_test_case_test.rb index 9532a88b..59894447 100644 --- a/test/integration/action_controller/serialization_test_case_test.rb +++ b/test/integration/action_controller/serialization_test_case_test.rb @@ -11,6 +11,11 @@ module ActionController def render_text render text: 'ok' end + + def render_template + prepend_view_path "./test/fixtures" + render template: "template" + end end tests MyController @@ -56,6 +61,11 @@ module ActionController end assert_match 'assert_serializer only accepts a String, Symbol, Regexp, ActiveModel::Serializer, or nil', e.message end + + def test_does_not_overwrite_notification_subscriptions + get :render_template + assert_template "template" + end end end end