1 files changed, 40 insertions, 6 deletions
diff --git a/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb b/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
index 93c1ffe152..ed23bced23 100644
--- a/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/sysaccept_spec.rb
@@ -1,7 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
-
-require 'socket'
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
 describe "TCPServer#sysaccept" do
   before :each do
@@ -14,7 +12,7 @@ describe "TCPServer#sysaccept" do
   end
 
   it 'blocks if no connections' do
-    lambda { @server.sysaccept }.should block_caller
+    -> { @server.sysaccept }.should block_caller
   end
 
   it 'returns file descriptor of an accepted connection' do
@@ -23,10 +21,46 @@ describe "TCPServer#sysaccept" do
 
       fd = @server.sysaccept
 
-      fd.should be_an_instance_of(Fixnum)
+      fd.should.is_a?(Integer)
     ensure
       sock.close if sock && !sock.closed?
       IO.for_fd(fd).close if fd
     end
   end
 end
+
+describe 'TCPServer#sysaccept' 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 'blocks the caller' do
+        -> { @server.sysaccept }.should block_caller
+      end
+    end
+
+    describe 'with a connected client' do
+      before do
+        @client = TCPSocket.new(ip_address, @server.connect_address.ip_port)
+      end
+
+      after do
+        Socket.for_fd(@fd).close if @fd
+        @client.close
+      end
+
+      it 'returns a new file descriptor as an Integer' do
+        @fd = @server.sysaccept
+
+        @fd.should.is_a?(Integer)
+        @fd.should_not == @client.fileno
+      end
+    end
+  end
+end