1 files changed, 18 insertions, 5 deletions
diff --git a/spec/ruby/library/socket/tcpserver/accept_spec.rb b/spec/ruby/library/socket/tcpserver/accept_spec.rb
index d38d95e0e1..f2aa0bf8e1 100644
--- a/spec/ruby/library/socket/tcpserver/accept_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/accept_spec.rb
@@ -15,7 +15,7 @@ describe "TCPServer#accept" do
     data = nil
     t = Thread.new do
       client = @server.accept
-      client.should be_kind_of(TCPSocket)
+      client.should.is_a?(TCPSocket)
       data = client.read(5)
       client << "goodbye"
       client.close
@@ -50,7 +50,7 @@ describe "TCPServer#accept" do
     t = Thread.new {
       -> {
         @server.accept
-      }.should raise_error(Exception, "interrupted")
+      }.should.raise(Exception, "interrupted")
     }
 
     Thread.pass while t.status and t.status != "sleep"
@@ -69,7 +69,7 @@ describe "TCPServer#accept" do
     Thread.pass while t.status and t.status != "sleep"
     # Thread#backtrace uses SIGVTALRM on TruffleRuby and potentially other implementations.
     # Sending a signal to a thread is not possible with Ruby APIs.
-    t.backtrace.join("\n").should.include?("in `accept'")
+    t.backtrace.join("\n").should =~ /in [`'](?:TCPServer#)?accept'/
 
     socket = TCPSocket.new('127.0.0.1', @port)
     socket.write("OK")
@@ -80,7 +80,7 @@ describe "TCPServer#accept" do
 
   it "raises an IOError if the socket is closed" do
     @server.close
-    -> { @server.accept }.should raise_error(IOError)
+    -> { @server.accept }.should.raise(IOError)
   end
 end
 
@@ -112,7 +112,20 @@ describe 'TCPServer#accept' do
 
       it 'returns a TCPSocket' do
         @socket = @server.accept
-        @socket.should be_an_instance_of(TCPSocket)
+        @socket.should.instance_of?(TCPSocket)
+      end
+
+      platform_is_not :windows do
+        it "returns a TCPSocket which is set to nonblocking" do
+          require 'io/nonblock'
+          @socket = @server.accept
+          @socket.should.nonblock?
+        end
+      end
+
+      it "returns a TCPSocket which is set to close on exec" do
+        @socket = @server.accept
+        @socket.should.close_on_exec?
       end
     end
   end