1 files changed, 17 insertions, 9 deletions
diff --git a/spec/ruby/library/socket/udpsocket/new_spec.rb b/spec/ruby/library/socket/udpsocket/new_spec.rb
index 5a2e4e1f31..aff111927c 100644
--- a/spec/ruby/library/socket/udpsocket/new_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/new_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 'UDPSocket.new' do
   after :each do
@@ -8,25 +8,33 @@ describe 'UDPSocket.new' do
 
   it 'without arguments' do
     @socket = UDPSocket.new
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
-  it 'using Fixnum argument' do
+  it 'using Integer argument' do
     @socket = UDPSocket.new(Socket::AF_INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'using Symbol argument' do
     @socket = UDPSocket.new(:INET)
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
   it 'using String argument' do
     @socket = UDPSocket.new('INET')
-    @socket.should be_an_instance_of(UDPSocket)
+    @socket.should.instance_of?(UDPSocket)
   end
 
-  it 'raises Errno::EAFNOSUPPORT if unsupported family passed' do
-    lambda { UDPSocket.new(-1) }.should raise_error(Errno::EAFNOSUPPORT)
+  it "does not use the given block and warns to use UDPSocket::open" do
+    -> {
+      @socket = UDPSocket.new { raise }
+    }.should complain(/warning: UDPSocket::new\(\) does not take block; use UDPSocket::open\(\) instead/)
+  end
+
+  it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT if unsupported family passed' do
+    -> { UDPSocket.new(-1) }.should.raise(SystemCallError) { |e|
+      [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should.include?(e.class)
+    }
   end
 end