1 files changed, 46 insertions, 11 deletions
diff --git a/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
index d6f7448084..ac08fe37c6 100644
--- a/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
 describe "Socket::TCPServer.accept_nonblock" do
   before :each do
@@ -13,19 +13,19 @@ describe "Socket::TCPServer.accept_nonblock" do
 
   it "accepts non blocking connections" do
     @server.listen(5)
-    lambda {
+    -> {
       @server.accept_nonblock
-    }.should raise_error(IO::WaitReadable)
+    }.should.raise(IO::WaitReadable)
 
     c = TCPSocket.new("127.0.0.1", @port)
-    sleep 0.1
+    IO.select([@server])
     s = @server.accept_nonblock
 
     port, address = Socket.unpack_sockaddr_in(s.getsockname)
 
     port.should == @port
     address.should == "127.0.0.1"
-    s.should be_kind_of(TCPSocket)
+    s.should.is_a?(TCPSocket)
 
     c.close
     s.close
@@ -33,17 +33,52 @@ describe "Socket::TCPServer.accept_nonblock" do
 
   it "raises an IOError if the socket is closed" do
     @server.close
-    lambda { @server.accept }.should raise_error(IOError)
+    -> { @server.accept }.should.raise(IOError)
   end
 
   describe 'without a connected client' do
     it 'raises error' do
-      lambda { @server.accept_nonblock }.should raise_error(IO::WaitReadable)
+      -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
     end
 
-    ruby_version_is '2.3' do
-      it 'returns :wait_readable in exceptionless mode' do
-        @server.accept_nonblock(exception: false).should == :wait_readable
+    it 'returns :wait_readable in exceptionless mode' do
+      @server.accept_nonblock(exception: false).should == :wait_readable
+    end
+  end
+end
+
+describe 'TCPServer#accept_nonblock' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    before do
+      @server = TCPServer.new(ip_address, 0)
+    end
+
+    after do
+      @server.close
+    end
+
+    describe 'without a connected client' do
+      it 'raises IO::WaitReadable' do
+        -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
+      end
+    end
+
+    platform_is_not :windows do # spurious
+      describe 'with a connected client' do
+        before do
+          @client = TCPSocket.new(ip_address, @server.connect_address.ip_port)
+        end
+
+        after do
+          @socket.close if @socket
+          @client.close
+        end
+
+        it 'returns a TCPSocket' do
+          IO.select([@server])
+          @socket = @server.accept_nonblock
+          @socket.should.instance_of?(TCPSocket)
+        end
       end
     end
   end