1 files changed, 23 insertions, 9 deletions
diff --git a/spec/ruby/library/socket/option/linger_spec.rb b/spec/ruby/library/socket/option/linger_spec.rb
index 687d421af3..87c5e0982e 100644
--- a/spec/ruby/library/socket/option/linger_spec.rb
+++ b/spec/ruby/library/socket/option/linger_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'
 
 option_pack = 'i*'
 platform_is :windows do
@@ -9,10 +9,12 @@ end
 describe "Socket::Option.linger" do
   it "creates a new Socket::Option for SO_LINGER" do
     so = Socket::Option.linger(1, 10)
-    so.should be_an_instance_of(Socket::Option)
+    so.should.instance_of?(Socket::Option)
+
     so.family.should == Socket::Constants::AF_UNSPEC
     so.level.should == Socket::Constants::SOL_SOCKET
     so.optname.should == Socket::Constants::SO_LINGER
+
     so.data.should == [1, 10].pack(option_pack)
   end
 
@@ -29,34 +31,46 @@ describe "Socket::Option#linger" do
   it "returns linger option" do
     so = Socket::Option.linger(0, 5)
     ary = so.linger
-    ary[0].should be_false
+    ary[0].should == false
     ary[1].should == 5
 
     so = Socket::Option.linger(false, 4)
     ary = so.linger
-    ary[0].should be_false
+    ary[0].should == false
     ary[1].should == 4
 
     so = Socket::Option.linger(1, 10)
     ary = so.linger
-    ary[0].should be_true
+    ary[0].should == true
     ary[1].should == 10
 
     so = Socket::Option.linger(true, 9)
     ary = so.linger
-    ary[0].should be_true
+    ary[0].should == true
     ary[1].should == 9
   end
 
   it "raises TypeError if not a SO_LINGER" do
     so = Socket::Option.int(:AF_UNSPEC, :SOL_SOCKET, :KEEPALIVE, 1)
-    lambda { so.linger }.should raise_error(TypeError)
+    -> { so.linger }.should.raise(TypeError)
+  end
+
+  it 'raises TypeError when called on a non SOL_SOCKET/SO_LINGER option' do
+    opt = Socket::Option.int(:INET, :IP, :TTL, 4)
+
+    -> { opt.linger }.should.raise(TypeError)
   end
 
   platform_is_not :windows do
     it "raises TypeError if option has not good size" do
       so = Socket::Option.int(:AF_UNSPEC, :SOL_SOCKET, :LINGER, 1)
-      lambda { so.linger }.should raise_error(TypeError)
+      -> { so.linger }.should.raise(TypeError)
     end
   end
+
+  it 'raises TypeError when called on a non linger option' do
+    opt = Socket::Option.new(:INET, :SOCKET, :LINGER, '')
+
+    -> { opt.linger }.should.raise(TypeError)
+  end
 end