Merge pull request #23811 from iamvery/string-channel

Ensure actioncable behaves as expected with non-string queues

5 files changed, 37 insertions, 1 deletions

diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index e2e6819f98..a6842d77ef 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Ensure ActionCable behaves correctly for non-string queue names.
+
+  *Jay Hayes*
+
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
 *  Added `em_redis_connector` and `redis_connector` to
diff --git a/actioncable/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb
index ff2994f198..431a5c1063 100644
--- a/actioncable/lib/action_cable/channel/streams.rb
+++ b/actioncable/lib/action_cable/channel/streams.rb
@@ -72,6 +72,7 @@ module ActionCable
       # Start streaming from the named <tt>broadcasting</tt> pubsub queue. Optionally, you can pass a <tt>callback</tt> that'll be used
       # instead of the default of just transmitting the updates straight to the subscriber.
       def stream_from(broadcasting, callback = nil)
+        broadcasting = String(broadcasting)
         # Don't send the confirmation until pubsub#subscribe is successful
         defer_subscription_confirmation!
 
diff --git a/actioncable/lib/action_cable/server/broadcasting.rb b/actioncable/lib/action_cable/server/broadcasting.rb
index f90fe7b9e2..98025f27f2 100644
--- a/actioncable/lib/action_cable/server/broadcasting.rb
+++ b/actioncable/lib/action_cable/server/broadcasting.rb
@@ -26,7 +26,7 @@ module ActionCable
       # Returns a broadcaster for a named <tt>broadcasting</tt> that can be reused. Useful when you have an object that
       # may need multiple spots to transmit to a specific broadcasting over and over.
       def broadcaster_for(broadcasting)
-        Broadcaster.new(self, broadcasting)
+        Broadcaster.new(self, String(broadcasting))
       end
 
       private
diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
index 947efd96d4..526ea92e4f 100644
--- a/actioncable/test/channel/stream_test.rb
+++ b/actioncable/test/channel/stream_test.rb
@@ -14,7 +14,12 @@ class ActionCable::Channel::StreamTest < ActionCable::TestCase
     def send_confirmation
       transmit_subscription_confirmation
     end
+  end
 
+  class SymbolChannel < ActionCable::Channel::Base
+    def subscribed
+      stream_from :channel
+    end
   end
 
   test "streaming start and stop" do
@@ -28,6 +33,17 @@ class ActionCable::Channel::StreamTest < ActionCable::TestCase
     end
   end
 
+  test "stream from non-string channel" do
+    run_in_eventmachine do
+      connection = TestConnection.new
+      connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("channel", kind_of(Proc), kind_of(Proc)).returns stub_everything(:pubsub) }
+      channel = SymbolChannel.new connection, ""
+
+      connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe) }
+      channel.unsubscribe_from_channel
+    end
+  end
+
   test "stream_for" do
     run_in_eventmachine do
       connection = TestConnection.new
diff --git a/actioncable/test/server/broadcasting_test.rb b/actioncable/test/server/broadcasting_test.rb
new file mode 100644
index 0000000000..3b4a7eaf90
--- /dev/null
+++ b/actioncable/test/server/broadcasting_test.rb
@@ -0,0 +1,15 @@
+require "test_helper"
+
+class BroadcastingTest < ActiveSupport::TestCase
+  class TestServer
+    include ActionCable::Server::Broadcasting
+  end
+
+  test "fetching a broadcaster converts the broadcasting queue to a string" do
+    broadcasting = :test_queue
+    server = TestServer.new
+    broadcaster = server.broadcaster_for(broadcasting)
+
+    assert_equal "test_queue", broadcaster.broadcasting
+  end
+end