Permalink
Browse files

Merge pull request #23370 from maclover7/actioncable-main-travis-build

Move Action Cable back to the main build
  • Loading branch information...
guilleiguaran committed Jan 31, 2016
2 parents acddd03 + ddd84f6 commit d6e0eeb1c68696316d2648366816688a95704351
Showing with 0 additions and 10 deletions.
  1. +0 −1 .travis.yml
  2. +0 −9 actioncable/test/client_test.rb
View
@@ -30,7 +30,6 @@ rvm:
matrix:
allow_failures:
- rvm: ruby-head
- env: "GEM=ac"
fast_finish: true
notifications:
email: false
@@ -146,15 +146,6 @@ def close
@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)

0 comments on commit d6e0eeb

Please sign in to comment.