Skip to content

Commit 087cdbf

Browse files
committed
Use released version of websocket-client-simple
It was originally done in rails#26714 but I'm pretty sure this has long since been fixed in ruby itself with ruby/ruby@bc855ef I also removed some code related to warnings relevant only on Ruby <= 2.7
1 parent 8a63fa5 commit 087cdbf

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ group :cable do
117117

118118
gem "redis-namespace"
119119

120-
gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
120+
gem "websocket-client-simple", require: false
121121
end
122122

123123
# Active Storage

Gemfile.lock

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/matthewd/websocket-client-simple.git
3-
revision: e161305f1a466b9398d86df3b1731b03362da91b
4-
branch: close-race
5-
specs:
6-
websocket-client-simple (0.3.0)
7-
event_emitter
8-
websocket
9-
101
GIT
112
remote: https://github.com/nahi/httpclient.git
123
revision: d57cc6d5ffee1b566b5c189fe6dc8cc89570b812
@@ -660,6 +651,9 @@ GEM
660651
hashdiff (>= 0.4.0, < 2.0.0)
661652
webrick (1.8.2)
662653
websocket (1.2.11)
654+
websocket-client-simple (0.8.0)
655+
event_emitter
656+
websocket
663657
websocket-driver (0.7.6)
664658
websocket-extensions (>= 0.1.0)
665659
websocket-extensions (0.1.5)
@@ -757,7 +751,7 @@ DEPENDENCIES
757751
web-console
758752
webmock
759753
webrick
760-
websocket-client-simple!
754+
websocket-client-simple
761755

762756
BUNDLED WITH
763757
2.5.16

actioncable/test/client_test.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,6 @@
88

99
require "active_support/hash_with_indifferent_access"
1010

11-
####
12-
# 😷 Warning suppression 😷
13-
WebSocket::Frame::Handler::Handler03.prepend Module.new {
14-
def initialize(*)
15-
@application_data_buffer = nil
16-
super
17-
end
18-
}
19-
20-
WebSocket::Frame::Data.prepend Module.new {
21-
def initialize(*)
22-
@masking_key = nil
23-
super
24-
end
25-
}
26-
#
27-
####
28-
2911
class ClientTest < ActionCable::TestCase
3012
WAIT_WHEN_EXPECTING_EVENT = 2
3113
WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5

0 commit comments

Comments
 (0)