aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-10-08 14:30:58 -0500
committerPratik Naik <pratiknaik@gmail.com>2015-10-08 15:50:11 -0500
commitb099a7d2705428a4434813079f399dec54ec7611 (patch)
tree481ff38b1db2939f32a8ecb639f4e3b118f66417 /test
parent91d6db34357634eaa0903b5c05a5db8b10066366 (diff)
downloadrails-b099a7d2705428a4434813079f399dec54ec7611.tar.gz
rails-b099a7d2705428a4434813079f399dec54ec7611.tar.bz2
rails-b099a7d2705428a4434813079f399dec54ec7611.zip
Run a single eventmachine timer to send heartbeats
Diffstat (limited to 'test')
-rw-r--r--test/connection/base_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/connection/base_test.rb b/test/connection/base_test.rb
index 2f008652ee..81009f0849 100644
--- a/test/connection/base_test.rb
+++ b/test/connection/base_test.rb
@@ -3,7 +3,7 @@ require 'stubs/test_server'
class ActionCable::Connection::BaseTest < ActiveSupport::TestCase
class Connection < ActionCable::Connection::Base
- attr_reader :websocket, :heartbeat, :subscriptions, :message_buffer, :connected
+ attr_reader :websocket, :subscriptions, :message_buffer, :connected
def connect
@connected = true
@@ -40,7 +40,6 @@ class ActionCable::Connection::BaseTest < ActiveSupport::TestCase
test "on connection open" do
assert ! @connection.connected
- EventMachine.expects(:add_periodic_timer)
@connection.websocket.expects(:transmit).with(regexp_matches(/\_ping/))
@connection.message_buffer.expects(:process!)
@@ -56,7 +55,6 @@ class ActionCable::Connection::BaseTest < ActiveSupport::TestCase
@connection.send :on_open
assert @connection.connected
- EventMachine.expects(:cancel_timer)
@connection.subscriptions.expects(:unsubscribe_from_all)
@connection.send :on_close