aboutsummaryrefslogtreecommitdiffstats
path: root/test/channel
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-11-04 17:22:48 -0600
committerPratik Naik <pratiknaik@gmail.com>2015-11-04 17:22:48 -0600
commitcb4ef80f20a23e9c42876b039d8af7d02fd416fb (patch)
tree5e8c2eaf367a9ee395f1213624ad42a08cbf4f06 /test/channel
parentee06b33e19019e771f0305a40b15885c22499a8b (diff)
parent7c1631fa48b8862f37d1026b4f0cf1061dd6947a (diff)
downloadrails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.gz
rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.bz2
rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.zip
Merge branch 'master' into subscription-rejection
Diffstat (limited to 'test/channel')
-rw-r--r--test/channel/base_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/channel/base_test.rb b/test/channel/base_test.rb
index 7eb8e15845..580338b44a 100644
--- a/test/channel/base_test.rb
+++ b/test/channel/base_test.rb
@@ -20,8 +20,8 @@ class ActionCable::Channel::BaseTest < ActiveSupport::TestCase
class ChatChannel < BasicChannel
attr_reader :room, :last_action
- on_subscribe :toggle_subscribed
- on_unsubscribe :toggle_subscribed
+ after_subscribe :toggle_subscribed
+ after_unsubscribe :toggle_subscribed
def initialize(*)
@subscribed = false