diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-06 11:41:18 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-10-06 12:51:26 +1030 |
| commit | acd7ba795ed0f69691b7e6879f17fa50d7664ea0 (patch) | |
| tree | cd79085d4b31aa86ab67bc6b76fa900f83948a2c | |
| parent | 4a7c5685c86d0349c98b2725ad01aa70ebcc3581 (diff) | |
| download | rails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.tar.gz rails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.tar.bz2 rails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.zip | |
Use a branch of websocket-client-simple, to work around read/close race
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -rw-r--r-- | actioncable/test/client_test.rb | 7 |
3 files changed, 11 insertions, 12 deletions
@@ -72,7 +72,7 @@ group :cable do gem "hiredis", require: false gem "redis", require: false - gem "websocket-client-simple", require: false + gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false gem "blade", require: false, platforms: [:ruby] gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby] diff --git a/Gemfile.lock b/Gemfile.lock index 14635a8cb2..0d70b24b5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,6 +30,15 @@ GIT ffi (>= 0.5.0) GIT + remote: https://github.com/matthewd/websocket-client-simple.git + revision: e161305f1a466b9398d86df3b1731b03362da91b + branch: close-race + specs: + websocket-client-simple (0.3.0) + event_emitter + websocket + +GIT remote: https://github.com/resque/resque.git revision: 20d885065ac19e7f7d7a982f4ed1296083db0300 specs: @@ -350,9 +359,6 @@ GEM nokogiri wdm (0.1.1) websocket (1.2.3) - websocket-client-simple (0.3.0) - event_emitter - websocket websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -414,7 +420,7 @@ DEPENDENCIES uglifier (>= 1.3.0) w3c_validators wdm (>= 0.1.0) - websocket-client-simple + websocket-client-simple! BUNDLED WITH 1.13.2 diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index f6d4ab3202..db10a7ad16 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -21,13 +21,6 @@ WebSocket::Frame::Data.prepend Module.new { super end } - -WebSocket::Client::Simple::Client.prepend Module.new { - def initialize(*) - @socket = nil - super - end -} # #### |