3 files changed, 45 insertions, 62 deletions
diff --git a/spec/ruby/library/socket/unixsocket/pair_spec.rb b/spec/ruby/library/socket/unixsocket/pair_spec.rb
index 9690142668..9f04f568fa 100644
--- a/spec/ruby/library/socket/unixsocket/pair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/pair_spec.rb
@@ -1,10 +1,8 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 require_relative '../shared/partially_closable_sockets'
-require_relative 'shared/pair'
 
 describe "UNIXSocket.pair" do
-  it_should_behave_like :unixsocket_pair
   it_should_behave_like :partially_closable_sockets
 
   before :each do
@@ -15,4 +13,47 @@ describe "UNIXSocket.pair" do
     @s1.close
     @s2.close
   end
+
+  it "returns two UNIXSockets" do
+    @s1.should.instance_of?(UNIXSocket)
+    @s2.should.instance_of?(UNIXSocket)
+  end
+
+  it "returns a pair of connected sockets" do
+    @s1.puts "foo"
+    @s2.gets.should == "foo\n"
+  end
+
+  platform_is_not :windows do
+    it "sets the socket paths to empty Strings" do
+      @s1.path.should == ""
+      @s2.path.should == ""
+    end
+
+    it "sets the socket addresses to empty Strings" do
+      @s1.addr.should == ["AF_UNIX", ""]
+      @s2.addr.should == ["AF_UNIX", ""]
+    end
+
+    it "sets the socket peer addresses to empty Strings" do
+      @s1.peeraddr.should == ["AF_UNIX", ""]
+      @s2.peeraddr.should == ["AF_UNIX", ""]
+    end
+  end
+
+  platform_is :windows do
+    it "emulates unnamed sockets with a temporary file with a path" do
+      @s1.addr.should == ["AF_UNIX", @s1.path]
+      @s2.peeraddr.should == ["AF_UNIX", @s1.path]
+    end
+
+    it "sets the peer address of first socket to an empty string" do
+      @s1.peeraddr.should == ["AF_UNIX", ""]
+    end
+
+    it "sets the address and path of second socket to an empty string" do
+      @s2.addr.should == ["AF_UNIX", ""]
+      @s2.path.should == ""
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/unixsocket/shared/pair.rb b/spec/ruby/library/socket/unixsocket/shared/pair.rb
deleted file mode 100644
index 49b6a6a413..0000000000
--- a/spec/ruby/library/socket/unixsocket/shared/pair.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require_relative '../../spec_helper'
-require_relative '../../fixtures/classes'
-
-describe :unixsocket_pair, shared: true do
-  it "returns two UNIXSockets" do
-    @s1.should.instance_of?(UNIXSocket)
-    @s2.should.instance_of?(UNIXSocket)
-  end
-
-  it "returns a pair of connected sockets" do
-    @s1.puts "foo"
-    @s2.gets.should == "foo\n"
-  end
-
-  platform_is_not :windows do
-    it "sets the socket paths to empty Strings" do
-      @s1.path.should == ""
-      @s2.path.should == ""
-    end
-
-    it "sets the socket addresses to empty Strings" do
-      @s1.addr.should == ["AF_UNIX", ""]
-      @s2.addr.should == ["AF_UNIX", ""]
-    end
-
-    it "sets the socket peer addresses to empty Strings" do
-      @s1.peeraddr.should == ["AF_UNIX", ""]
-      @s2.peeraddr.should == ["AF_UNIX", ""]
-    end
-  end
-
-  platform_is :windows do
-    it "emulates unnamed sockets with a temporary file with a path" do
-      @s1.addr.should == ["AF_UNIX", @s1.path]
-      @s2.peeraddr.should == ["AF_UNIX", @s1.path]
-    end
-
-    it "sets the peer address of first socket to an empty string" do
-      @s1.peeraddr.should == ["AF_UNIX", ""]
-    end
-
-    it "sets the address and path of second socket to an empty string" do
-      @s2.addr.should == ["AF_UNIX", ""]
-      @s2.path.should == ""
-    end
-  end
-end
diff --git a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
index c61fc00be4..a8bfb412e5 100644
--- a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
@@ -1,18 +1,7 @@
 require_relative '../spec_helper'
-require_relative '../fixtures/classes'
-require_relative '../shared/partially_closable_sockets'
-require_relative 'shared/pair'
 
 describe "UNIXSocket.socketpair" do
-  it_should_behave_like :unixsocket_pair
-  it_should_behave_like :partially_closable_sockets
-
-  before :each do
-    @s1, @s2 = UNIXSocket.socketpair
-  end
-
-  after :each do
-    @s1.close
-    @s2.close
+  it "is an alias of UNIXSocket.pair" do
+    UNIXSocket.method(:socketpair).should == UNIXSocket.method(:pair)
   end
 end