aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/channel/streams.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-01-24 23:40:33 +0100
committerGitHub <noreply@github.com>2019-01-24 23:40:33 +0100
commit36c840057fb46c09457a8b091d2db6351d2efeef (patch)
tree81550fc640989953b8311d1c94584b36f716c752 /actioncable/lib/action_cable/channel/streams.rb
parent87626a60426e7b8aa8e4048d7d4b7463ba62bd96 (diff)
parentcfe65cb478a44f19f3b4562cd1cf3c99d2cb930b (diff)
downloadrails-36c840057fb46c09457a8b091d2db6351d2efeef.tar.gz
rails-36c840057fb46c09457a8b091d2db6351d2efeef.tar.bz2
rails-36c840057fb46c09457a8b091d2db6351d2efeef.zip
Merge pull request #35021 from palkan/refactor/broadcasting-for-testing
Action Cable: move channel_name to Channel.broadcasting_for
Diffstat (limited to 'actioncable/lib/action_cable/channel/streams.rb')
-rw-r--r--actioncable/lib/action_cable/channel/streams.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb
index 81c2c38064..7e1ed3c850 100644
--- a/actioncable/lib/action_cable/channel/streams.rb
+++ b/actioncable/lib/action_cable/channel/streams.rb
@@ -99,7 +99,7 @@ module ActionCable
# Pass <tt>coder: ActiveSupport::JSON</tt> to decode messages as JSON before passing to the callback.
# Defaults to <tt>coder: nil</tt> which does no decoding, passes raw messages.
def stream_for(model, callback = nil, coder: nil, &block)
- stream_from(broadcasting_for([ channel_name, model ]), callback || block, coder: coder)
+ stream_from(broadcasting_for(model), callback || block, coder: coder)
end
# Unsubscribes all streams associated with this channel from the pubsub queue.