1 files changed, 53 insertions, 12 deletions

diff --git a/spec/ruby/library/socket/tcpserver/new_spec.rb b/spec/ruby/library/socket/tcpserver/new_spec.rb
index 4717b95a2c..70b8d4352e 100644
--- a/spec/ruby/library/socket/tcpserver/new_spec.rb
+++ b/spec/ruby/library/socket/tcpserver/new_spec.rb
@@ -10,7 +10,7 @@ describe "TCPServer.new" do
     @server = TCPServer.new('127.0.0.1', 0)
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     # on some platforms (Mac), MRI
     # returns comma at the end.
     addr[2].should =~ /^#{SocketSpecs.hostname}\b/
@@ -20,7 +20,7 @@ describe "TCPServer.new" do
   it "binds to localhost and a port with either IPv4 or IPv6" do
     @server = TCPServer.new(SocketSpecs.hostname, 0)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     if addr[0] == 'AF_INET'
       addr[2].should =~ /^#{SocketSpecs.hostname}\b/
       addr[3].should == '127.0.0.1'
@@ -34,36 +34,77 @@ describe "TCPServer.new" do
     @server = TCPServer.new('', 0)
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
 
   it "binds to INADDR_ANY if the hostname is empty and the port is a string" do
-    @server = TCPServer.new('', 0)
+    @server = TCPServer.new('', '0')
+    addr = @server.addr
+    addr[0].should == 'AF_INET'
+    addr[1].should.is_a?(Integer)
+    addr[2].should == '0.0.0.0'
+    addr[3].should == '0.0.0.0'
+  end
+
+  it "binds to a port if the port is explicitly nil" do
+    @server = TCPServer.new('', nil)
+    addr = @server.addr
+    addr[0].should == 'AF_INET'
+    addr[1].should.is_a?(Integer)
+    addr[2].should == '0.0.0.0'
+    addr[3].should == '0.0.0.0'
+  end
+
+  it "binds to a port if the port is an empty string" do
+    @server = TCPServer.new('', '')
     addr = @server.addr
     addr[0].should == 'AF_INET'
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
     addr[2].should == '0.0.0.0'
     addr[3].should == '0.0.0.0'
   end
 
   it "coerces port to string, then determines port from that number or service name" do
-    lambda { TCPServer.new(SocketSpecs.hostname, Object.new) }.should raise_error(TypeError)
+    -> { TCPServer.new(SocketSpecs.hostname, Object.new) }.should.raise(TypeError)
 
     port = Object.new
     port.should_receive(:to_str).and_return("0")
 
     @server = TCPServer.new(SocketSpecs.hostname, port)
     addr = @server.addr
-    addr[1].should be_kind_of(Integer)
+    addr[1].should.is_a?(Integer)
 
     # TODO: This should also accept strings like 'https', but I don't know how to
     # pick such a service port that will be able to reliably bind...
   end
 
+  it "has a single argument form and treats it as a port number" do
+    @server = TCPServer.new(0)
+    addr = @server.addr
+    addr[1].should.is_a?(Integer)
+  end
+
+  it "coerces port to a string when it is the only argument" do
+    -> { TCPServer.new(Object.new) }.should.raise(TypeError)
+
+    port = Object.new
+    port.should_receive(:to_str).and_return("0")
+
+    @server = TCPServer.new(port)
+    addr = @server.addr
+    addr[1].should.is_a?(Integer)
+  end
+
+  it "does not use the given block and warns to use TCPServer::open" do
+    -> {
+      @server = TCPServer.new(0) { raise }
+    }.should complain(/warning: TCPServer::new\(\) does not take block; use TCPServer::open\(\) instead/)
+  end
+
   it "raises Errno::EADDRNOTAVAIL when the address is unknown" do
-    lambda { TCPServer.new("1.2.3.4", 0) }.should raise_error(Errno::EADDRNOTAVAIL)
+    -> { TCPServer.new("1.2.3.4", 0) }.should.raise(Errno::EADDRNOTAVAIL)
   end
 
   # There is no way to make this fail-proof on all machines, because
@@ -71,17 +112,17 @@ describe "TCPServer.new" do
   # traditionally invalidly named ones.
   quarantine! do
     it "raises a SocketError when the host is unknown" do
-      lambda {
+      -> {
         TCPServer.new("--notavalidname", 0)
-      }.should raise_error(SocketError)
+      }.should.raise(SocketError)
     end
   end
 
   it "raises Errno::EADDRINUSE when address is already in use" do
     @server = TCPServer.new('127.0.0.1', 0)
-    lambda {
+    -> {
       @server = TCPServer.new('127.0.0.1', @server.addr[1])
-    }.should raise_error(Errno::EADDRINUSE)
+    }.should.raise(Errno::EADDRINUSE)
   end
 
   platform_is_not :windows, :aix do