Enable File.socket? test on Windows, improve FileTest.socket?

Author: trinistr

core/file/socket_spec.rb

@@ -1,42 +1,10 @@
 require_relative '../../spec_helper'
 require_relative '../../shared/file/socket'
-require 'socket'
 
 describe "File.socket?" do
   it_behaves_like :file_socket, :socket?, File
-end
 
-describe "File.socket?" do
   it "returns false if file does not exist" do
     File.socket?("I_am_a_bogus_file").should == false
   end
-
-  it "returns false if the file is not a socket" do
-    filename = tmp("i_exist")
-    touch(filename)
-
-    File.socket?(filename).should == false
-
-    rm_r filename
-  end
-end
-
-platform_is_not :windows do
-  describe "File.socket?" do
-    before :each do
-      # We need a really short name here.
-      # On Linux the path length is limited to 107, see unix(7).
-      @name = tmp("s")
-      @server = UNIXServer.new @name
-    end
-
-    after :each do
-      @server.close
-      rm_r @name
-    end
-
-    it "returns true if the file is a socket" do
-      File.socket?(@name).should == true
-    end
-  end
 end

core/filetest/socket_spec.rb

@@ -3,4 +3,8 @@
 
 describe "FileTest.socket?" do
   it_behaves_like :file_socket, :socket?, FileTest
+
+  it "returns false if file does not exist" do
+    FileTest.socket?("I_am_a_bogus_file").should == false
+  end
 end

shared/file/socket.rb

@@ -1,3 +1,33 @@
 describe :file_socket, shared: true do
-  it "accepts an object that has a #to_path method"
+  it "returns false if the file is not a socket" do
+    filename = tmp("i_exist")
+    touch(filename)
+
+    @object.send(@method, filename).should == false
+
+    rm_r filename
+  end
+
+  it "returns true if the file is a socket" do
+    require 'socket'
+
+    # We need a really short name here.
+    # On Linux the path length is limited to 107, see unix(7).
+    name = tmp("s")
+    server = UNIXServer.new(name)
+
+    @object.send(@method, name).should == true
+
+    server.close
+    rm_r name
+  end
+
+  it "accepts an object that has a #to_path method" do
+    obj = Object.new
+    def obj.to_path
+      __FILE__
+    end
+
+    @object.send(@method, obj).should == false
+  end
 end