4 files changed, 33 insertions, 8 deletions
diff --git a/spec/ruby/shared/file/exist.rb b/spec/ruby/shared/file/exist.rb
index 3bd97711b4..67424146c5 100644
--- a/spec/ruby/shared/file/exist.rb
+++ b/spec/ruby/shared/file/exist.rb
@@ -4,11 +4,6 @@ describe :file_exist, shared: true do
     @object.send(@method, 'a_fake_file').should == false
   end
 
-  it "returns true if the file exist using the alias exists?" do
-    @object.send(@method, __FILE__).should == true
-    @object.send(@method, 'a_fake_file').should == false
-  end
-
   it "raises an ArgumentError if not passed one argument" do
     -> { @object.send(@method) }.should raise_error(ArgumentError)
     -> { @object.send(@method, __FILE__, __FILE__) }.should raise_error(ArgumentError)
diff --git a/spec/ruby/shared/file/size.rb b/spec/ruby/shared/file/size.rb
index 880dfbb612..cba99fe6a5 100644
--- a/spec/ruby/shared/file/size.rb
+++ b/spec/ruby/shared/file/size.rb
@@ -72,7 +72,7 @@ describe :file_size_nil_when_missing, shared: true do
   end
 
   it "returns nil if file_name doesn't exist or has 0 size" do
-     @object.send(@method, @missing).should == nil
+    @object.send(@method, @missing).should == nil
   end
 end
 
diff --git a/spec/ruby/shared/file/socket.rb b/spec/ruby/shared/file/socket.rb
index 55a1cfd284..ef6c482d1c 100644
--- a/spec/ruby/shared/file/socket.rb
+++ b/spec/ruby/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
diff --git a/spec/ruby/shared/file/sticky.rb b/spec/ruby/shared/file/sticky.rb
index 38bb6ed26b..e07fa22fd7 100644
--- a/spec/ruby/shared/file/sticky.rb
+++ b/spec/ruby/shared/file/sticky.rb
@@ -8,7 +8,7 @@ describe :file_sticky, shared: true do
     Dir.rmdir(@dir) if File.exist?(@dir)
   end
 
-  platform_is_not :windows, :darwin, :freebsd, :netbsd, :openbsd, :solaris, :aix do
+  platform_is_not :windows, :darwin, :freebsd, :netbsd, :openbsd, :aix do
     it "returns true if the named file has the sticky bit, otherwise false" do
       Dir.mkdir @dir, 01755