1 files changed, 71 insertions, 22 deletions
diff --git a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
index b94e91e879..531d851658 100644
--- a/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_nonblock_spec.rb
@@ -1,37 +1,86 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
 describe "UNIXServer#accept_nonblock" do
+  before :each do
+    @path = SocketSpecs.socket_path
+    @server = UNIXServer.open(@path)
+    @client = UNIXSocket.open(@path)
 
-  platform_is_not :windows do
-    before :each do
-      @path = SocketSpecs.socket_path
-      @server = UNIXServer.open(@path)
-      @client = UNIXSocket.open(@path)
+    @socket = @server.accept_nonblock
+    @client.send("foobar", 0)
+  end
+
+  after :each do
+    @socket.close
+    @client.close
+    @server.close
+    SocketSpecs.rm_socket @path
+  end
+
+  it "accepts a connection in a non-blocking way" do
+    data = @socket.recvfrom(6).first
+    data.should == "foobar"
+  end
+
+  it "returns a UNIXSocket" do
+    @socket.should.is_a?(UNIXSocket)
+  end
+
+  it 'returns :wait_readable in exceptionless mode' do
+    @server.accept_nonblock(exception: false).should == :wait_readable
+  end
+end
+
+describe 'UNIXServer#accept_nonblock' do
+  before do
+    @path   = SocketSpecs.socket_path
+    @server = UNIXServer.new(@path)
+  end
+
+  after do
+    @server.close
+    rm_r(@path)
+  end
 
-      @socket = @server.accept_nonblock
-      @client.send("foobar", 0)
+  describe 'without a client' do
+    it 'raises IO::WaitReadable' do
+      -> { @server.accept_nonblock }.should.raise(IO::WaitReadable)
     end
+  end
 
-    after :each do
-      @socket.close
-      @client.close
-      @server.close
-      SocketSpecs.rm_socket @path
+  describe 'with a client' do
+    before do
+      @client = UNIXSocket.new(@path)
     end
 
-    it "accepts a connection in a non-blocking way" do
-      data = @socket.recvfrom(6).first
-      data.should == "foobar"
+    after do
+      @client.close
+      @socket.close if @socket
     end
 
-    it "returns a UNIXSocket" do
-      @socket.should be_kind_of(UNIXSocket)
+    describe 'without any data' do
+      it 'returns a UNIXSocket' do
+        @socket = @server.accept_nonblock
+        @socket.should.instance_of?(UNIXSocket)
+      end
     end
 
-    ruby_version_is '2.3' do
-      it 'returns :wait_readable in exceptionless mode' do
-        @server.accept_nonblock(exception: false).should == :wait_readable
+    describe 'with data available' do
+      before do
+        @client.write('hello')
+      end
+
+      it 'returns a UNIXSocket' do
+        @socket = @server.accept_nonblock
+        @socket.should.instance_of?(UNIXSocket)
+      end
+
+      describe 'the returned UNIXSocket' do
+        it 'can read the data written' do
+          @socket = @server.accept_nonblock
+          @socket.recv(5).should == 'hello'
+        end
       end
     end
   end