aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMike A. Owens <mike@filespanker.com>2015-08-24 13:35:59 -0400
committerMike A. Owens <mike@filespanker.com>2015-08-24 13:46:41 -0400
commitcf426a7ee680e8cd30a4b5afccf7e140537836f4 (patch)
tree0782fdca55758ae6e700b32ebbf6b935a9f3e655 /test
parent6143352f8ffba303f0c7644be7573f6725554cb3 (diff)
downloadrails-cf426a7ee680e8cd30a4b5afccf7e140537836f4.tar.gz
rails-cf426a7ee680e8cd30a4b5afccf7e140537836f4.tar.bz2
rails-cf426a7ee680e8cd30a4b5afccf7e140537836f4.zip
Use ActiveSupport::Callbacks for Channel subscription callbacks.
* Rely on AS::Callbacks for callback handling. * Add before_subscribe, after_subscribe, before_unsubscribe and after_unsubscribe convenience methods * alias on_subscribe and on_unsubscribe to after_subscribe and after_unsubscribe, respectively. * Remove `subscribed` and `unsubscribed` from the callback chain: these methods are now executed as the subject of the callbacks. * Update portions of ActionCable to use the more specific callback names.
Diffstat (limited to 'test')
-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 e7944ff06b..ca632b124b 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 subscribed
@room = Room.new params[:id]