From 9d426d3fe38f58b6157e60223fff01ba575712f6 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Sat, 30 Jan 2016 21:04:00 -0500 Subject: Move Action Cable back to the main build --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 869507a9fd..ae38617b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ rvm: matrix: allow_failures: - rvm: ruby-head - - env: "GEM=ac" fast_finish: true notifications: email: false -- cgit v1.2.3 From ddd84f6193ee44cdf33db60db469463940ea76cd Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Sat, 30 Jan 2016 21:39:05 -0500 Subject: Remove unused method --- actioncable/test/client_test.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index d7eecfa322..28086337c3 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -145,15 +145,6 @@ class ClientTest < ActionCable::TestCase @ws.close @closed.wait(WAIT_WHEN_EXPECTING_EVENT) end - - def close! - sock = BasicSocket.for_fd(@ws.instance_variable_get(:@stream).detach) - - # Force a TCP reset - sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack('ii')) - - sock.close - end end def faye_client(port) -- cgit v1.2.3