aboutsummaryrefslogtreecommitdiffstats
path: root/test/channel
diff options
context:
space:
mode:
authorPratik <pratiknaik@gmail.com>2015-10-19 10:09:56 -0500
committerPratik <pratiknaik@gmail.com>2015-10-19 10:09:56 -0500
commit0d99cfd5ca755643a23beec22513072987c8edba (patch)
tree348c097e4e7298778b93a59e6ab9ea88eaed4101 /test/channel
parentdf5a32dfbc94723d847aa8d8034041a2bd8751e2 (diff)
parent60748de10402f46c21b6a288072b4e37cd3a607c (diff)
downloadrails-0d99cfd5ca755643a23beec22513072987c8edba.tar.gz
rails-0d99cfd5ca755643a23beec22513072987c8edba.tar.bz2
rails-0d99cfd5ca755643a23beec22513072987c8edba.zip
Merge pull request #98 from rails/subscription-confirmation
Send subscription confirmation from server to the client to avoid race conditions
Diffstat (limited to 'test/channel')
-rw-r--r--test/channel/base_test.rb6
-rw-r--r--test/channel/stream_test.rb35
2 files changed, 32 insertions, 9 deletions
diff --git a/test/channel/base_test.rb b/test/channel/base_test.rb
index bac8569780..7eb8e15845 100644
--- a/test/channel/base_test.rb
+++ b/test/channel/base_test.rb
@@ -139,4 +139,10 @@ class ActionCable::Channel::BaseTest < ActiveSupport::TestCase
expected = ActiveSupport::JSON.encode "identifier" => "{id: 1}", "message" => { "data" => "latest" }
assert_equal expected, @connection.last_transmission
end
+
+ test "subscription confirmation" do
+ expected = ActiveSupport::JSON.encode "identifier" => "{id: 1}", "type" => "confirm_subscription"
+ assert_equal expected, @connection.last_transmission
+ end
+
end
diff --git a/test/channel/stream_test.rb b/test/channel/stream_test.rb
index 4e0248d7b4..08cfef5736 100644
--- a/test/channel/stream_test.rb
+++ b/test/channel/stream_test.rb
@@ -12,28 +12,45 @@ class ActionCable::Channel::StreamTest < ActionCable::TestCase
end
end
- setup do
- @connection = TestConnection.new
- end
-
test "streaming start and stop" do
run_in_eventmachine do
- @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("test_room_1").returns stub_everything(:pubsub) }
- channel = ChatChannel.new @connection, "{id: 1}", { id: 1 }
+ connection = TestConnection.new
+ connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("test_room_1").returns stub_everything(:pubsub) }
+ channel = ChatChannel.new connection, "{id: 1}", { id: 1 }
- @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe_proc) }
+ connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe_proc) }
channel.unsubscribe_from_channel
end
end
test "stream_for" do
run_in_eventmachine do
+ connection = TestConnection.new
EM.next_tick do
- @connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("action_cable:channel:stream_test:chat:Room#1-Campfire").returns stub_everything(:pubsub) }
+ connection.expects(:pubsub).returns mock().tap { |m| m.expects(:subscribe).with("action_cable:channel:stream_test:chat:Room#1-Campfire").returns stub_everything(:pubsub) }
end
- channel = ChatChannel.new @connection, ""
+ channel = ChatChannel.new connection, ""
channel.stream_for Room.new(1)
end
end
+
+ test "stream_from subscription confirmation" do
+ EM.run do
+ connection = TestConnection.new
+ connection.expects(:pubsub).returns EM::Hiredis.connect.pubsub
+
+ channel = ChatChannel.new connection, "{id: 1}", { id: 1 }
+ assert_nil connection.last_transmission
+
+ EM::Timer.new(0.1) do
+ expected = ActiveSupport::JSON.encode "identifier" => "{id: 1}", "type" => "confirm_subscription"
+ assert_equal expected, connection.last_transmission, "Did not receive subscription confirmation within 0.1s"
+
+ EM.run_deferred_callbacks
+ EM.stop
+ end
+ end
+ end
+
end