diff options
author | Matthew Draper <matthew@trebex.net> | 2016-01-20 15:54:20 +1030 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:51:06 +1030 |
commit | 68a9060d02b1eb35c12843c0f1653809b776b35b (patch) | |
tree | cde309fbbd468e972a1e01df4f50c1d2bbe119b4 /actioncable/test/connection | |
parent | dcdadd5e82eed2e64d21399599b14501c3e16cc3 (diff) | |
download | rails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.gz rails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.bz2 rails-68a9060d02b1eb35c12843c0f1653809b776b35b.zip |
Using a hacked faye-websocket, drop EventMachine
Diffstat (limited to 'actioncable/test/connection')
-rw-r--r-- | actioncable/test/connection/base_test.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb index 182562db82..579578d0a7 100644 --- a/actioncable/test/connection/base_test.rb +++ b/actioncable/test/connection/base_test.rb @@ -37,6 +37,8 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase connection.process assert connection.websocket.possible? + + wait_for_async assert connection.websocket.alive? end end @@ -58,11 +60,10 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase connection.websocket.expects(:transmit).with(regexp_matches(/\_ping/)) connection.message_buffer.expects(:process!) - # Allow EM to run on_open callback - EM.next_tick do - assert_equal [ connection ], @server.connections - assert connection.connected - end + wait_for_async + + assert_equal [ connection ], @server.connections + assert connection.connected end end @@ -72,7 +73,7 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase connection.process # Setup the connection - EventMachine.stubs(:add_periodic_timer).returns(true) + Concurrent::TimerTask.stubs(:new).returns(true) connection.send :on_open assert connection.connected |