Skip to content

Commit

Permalink
Avoid overwriting notifications for template assertions.
Browse files Browse the repository at this point in the history
  • Loading branch information
tristandunn committed Aug 29, 2014
1 parent d5a993e commit 610aeb2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/action_controller/serialization_test_case.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module SerializationAssertions
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|
Expand All @@ -16,7 +16,7 @@ def setup_subscriptions
end
end

def teardown_subscriptions
def teardown_serialization_subscriptions
ActiveSupport::Notifications.unsubscribe("!serialize.active_model_serializers")
end

Expand Down
1 change: 1 addition & 0 deletions test/fixtures/template.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Hello.</p>
10 changes: 10 additions & 0 deletions test/integration/action_controller/serialization_test_case_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ def render_using_serializer
def render_text
render text: 'ok'
end

def render_template
prepend_view_path "./test/fixtures"
render template: "template"
end
end

tests MyController
Expand Down Expand Up @@ -56,6 +61,11 @@ def test_raises_argument_error_when_asserting_with_invalid_object
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

0 comments on commit 610aeb2

Please sign in to comment.