Merge pull request #34 from lsylvester/add-broadcast_to-and-stream_for-methods-to-channel

add broadcast_to and stream_for methods as per #26

1 files changed, 11 insertions, 3 deletions

diff --git a/test/channel/stream_test.rb b/test/channel/stream_test.rb
index 1a8c259d11..b0a6f49072 100644
--- a/test/channel/stream_test.rb
+++ b/test/channel/stream_test.rb
@@ -5,8 +5,10 @@ require 'stubs/room'
 class ActionCable::Channel::StreamTest < ActiveSupport::TestCase
   class ChatChannel < ActionCable::Channel::Base
     def subscribed
-      @room = Room.new params[:id]
-      stream_from "test_room_#{@room.id}"
+      if params[:id]
+        @room = Room.new params[:id]
+        stream_from "test_room_#{@room.id}"
+      end
     end
   end
 
@@ -15,10 +17,16 @@ class ActionCable::Channel::StreamTest < ActiveSupport::TestCase
   end
 
   test "streaming start and stop" do
-    @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe) }
+    @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("test_room_1") }
     channel = ChatChannel.new @connection, "{id: 1}", { id: 1 }
 
     @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe_proc) }
     channel.unsubscribe_from_channel
   end
+
+  test "stream_for" do
+    @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("action_cable:channel:stream_test:chat:Room#1-Campfire") }
+    channel = ChatChannel.new @connection, ""
+    channel.stream_for Room.new(1)
+  end
 end