diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
| commit | bbba0649f529626a076c4247047b60cfbe86d5e4 (patch) | |
| tree | cdbf52c160399441574d1f13dd6587ee504e002d /actioncable/test/channel/periodic_timers_test.rb | |
| parent | cd73632d9d47752013f46e775e59241215cfd8e9 (diff) | |
| parent | a373be9da45d4bee684ea03420212780ec1ef4b1 (diff) | |
| download | rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.gz rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.bz2 rails-bbba0649f529626a076c4247047b60cfbe86d5e4.zip | |
Merge pull request #23992 from matthewd/em-option
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'actioncable/test/channel/periodic_timers_test.rb')
| -rw-r--r-- | actioncable/test/channel/periodic_timers_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/channel/periodic_timers_test.rb b/actioncable/test/channel/periodic_timers_test.rb index 64f0247cd6..e6f0c14c9d 100644 --- a/actioncable/test/channel/periodic_timers_test.rb +++ b/actioncable/test/channel/periodic_timers_test.rb @@ -31,7 +31,7 @@ class ActionCable::Channel::PeriodicTimersTest < ActiveSupport::TestCase end test "timer start and stop" do - Concurrent::TimerTask.expects(:new).times(2).returns(true) + @connection.server.event_loop.expects(:timer).times(2).returns(true) channel = ChatChannel.new @connection, "{id: 1}", { id: 1 } channel.expects(:stop_periodic_timers).once |