diff options
| -rw-r--r-- | actioncable/test/client_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index 4629d858a1..3d9690fb01 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -66,8 +66,8 @@ class ClientTest < ActionCable::TestCase yield port ensure - server.stop(true) - t.join + server.stop(true) if server + t.join if t end def start_event_machine @@ -135,7 +135,6 @@ class ClientTest < ActionCable::TestCase end @ws.on(:close) do |event| - @ws = nil em_controller.stop_event_machine @closed.set end |