diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-02 11:20:19 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-02 12:17:15 +1030 |
| commit | a373be9da45d4bee684ea03420212780ec1ef4b1 (patch) | |
| tree | 3798c6117d8944189c84bd5363d49dbf935ea407 /actioncable/test/client_test.rb | |
| parent | 541e4abb4b3710a384aefac83cafd0ab878c60bf (diff) | |
| download | rails-a373be9da45d4bee684ea03420212780ec1ef4b1.tar.gz rails-a373be9da45d4bee684ea03420212780ec1ef4b1.tar.bz2 rails-a373be9da45d4bee684ea03420212780ec1ef4b1.zip | |
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'actioncable/test/client_test.rb')
| -rw-r--r-- | actioncable/test/client_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index a6619d3bd2..30620c792b 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -8,8 +8,8 @@ require 'faye/websocket' require 'json' class ClientTest < ActionCable::TestCase - WAIT_WHEN_EXPECTING_EVENT = 3 - WAIT_WHEN_NOT_EXPECTING_EVENT = 0.2 + WAIT_WHEN_EXPECTING_EVENT = 8 + WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5 def setup ActionCable.instance_variable_set(:@server, nil) @@ -17,6 +17,7 @@ class ClientTest < ActionCable::TestCase server.config.logger = Logger.new(StringIO.new).tap { |l| l.level = Logger::UNKNOWN } server.config.cable = { adapter: 'async' }.with_indifferent_access + server.config.use_faye = ENV['FAYE'].present? # and now the "real" setup for our test: server.config.disable_request_forgery_protection = true |