1 files changed, 31 insertions, 16 deletions
diff --git a/spec/ruby/library/socket/addrinfo/unix_spec.rb b/spec/ruby/library/socket/addrinfo/unix_spec.rb
index 00eedc96e7..da65e13efb 100644
--- a/spec/ruby/library/socket/addrinfo/unix_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/unix_spec.rb
@@ -1,19 +1,34 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require 'socket'
+require_relative '../spec_helper'
 
-describe "Addrinfo.unix" do
+describe 'Addrinfo.unix' do
+  it 'returns an Addrinfo instance' do
+    Addrinfo.unix('socket').should.instance_of?(Addrinfo)
+  end
 
-  platform_is_not :windows do
-    before :each do
-      @addrinfo = Addrinfo.unix("/tmp/sock")
-    end
+  it 'sets the IP address' do
+    Addrinfo.unix('socket').unix_path.should == 'socket'
+  end
 
-    it "creates a addrinfo for a unix socket" do
-      @addrinfo.pfamily.should == Socket::PF_UNIX
-      @addrinfo.socktype.should == Socket::SOCK_STREAM
-      @addrinfo.protocol.should == 0
-      @addrinfo.unix_path.should == "/tmp/sock"
-    end
+  it 'sets the address family' do
+    Addrinfo.unix('socket').afamily.should == Socket::AF_UNIX
+  end
+
+  it 'sets the protocol family' do
+    Addrinfo.unix('socket').pfamily.should == Socket::PF_UNIX
+  end
+
+  it 'sets the socket type' do
+    Addrinfo.unix('socket').socktype.should == Socket::SOCK_STREAM
+  end
+
+  it 'sets a custom socket type' do
+    addr = Addrinfo.unix('socket', Socket::SOCK_DGRAM)
+
+    addr.socktype.should == Socket::SOCK_DGRAM
+  end
+
+  it 'sets the socket protocol to 0' do
+    Addrinfo.unix('socket').protocol.should == 0
   end
 end
 
@@ -25,7 +40,7 @@ describe "Addrinfo#unix?" do
     end
 
     it "returns false" do
-      @addrinfo.unix?.should be_false
+      @addrinfo.unix?.should == false
     end
 
   end
@@ -36,7 +51,7 @@ describe "Addrinfo#unix?" do
     end
 
     it "returns false" do
-      @addrinfo.unix?.should be_false
+      @addrinfo.unix?.should == false
     end
   end
 
@@ -47,7 +62,7 @@ describe "Addrinfo#unix?" do
       end
 
       it "returns true" do
-        @addrinfo.unix?.should be_true
+        @addrinfo.unix?.should == true
       end
     end
   end