4 files changed, 44 insertions, 50 deletions
diff --git a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
index 96324982e5..329f8267d3 100644
--- a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
@@ -2,7 +2,6 @@ require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
 describe "Socket::IPSocket#getaddress" do
-
   it "returns the IP address of hostname" do
     addr_local = IPSocket.getaddress(SocketSpecs.hostname)
     ["127.0.0.1", "::1"].include?(addr_local).should == true
@@ -14,6 +13,10 @@ describe "Socket::IPSocket#getaddress" do
     IPSocket.getaddress('::1').should == '::1'
   end
 
+  it 'returns IPv4 compatible IPv6 addresses' do
+    IPSocket.getaddress('::ffff:192.168.1.1').should == '::ffff:192.168.1.1'
+  end
+
   # There is no way to make this fail-proof on all machines, because
   # DNS servers like opendns return A records for ANY host, including
   # traditionally invalidly named ones.
diff --git a/spec/ruby/library/socket/unixsocket/pair_spec.rb b/spec/ruby/library/socket/unixsocket/pair_spec.rb
index d80b60894d..b0a3b2af99 100644
--- a/spec/ruby/library/socket/unixsocket/pair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/pair_spec.rb
@@ -1,9 +1,11 @@
 require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 require_relative '../shared/partially_closable_sockets'
+require_relative 'shared/pair'
 
 with_feature :unix_socket do
   describe "UNIXSocket.pair" do
+    it_should_behave_like :unixsocket_pair
     it_should_behave_like :partially_closable_sockets
 
     before :each do
@@ -14,25 +16,5 @@ with_feature :unix_socket do
       @s1.close
       @s2.close
     end
-
-    it "returns a pair of connected sockets" do
-      @s1.puts "foo"
-      @s2.gets.should == "foo\n"
-    end
-
-    it "returns sockets with no name" do
-      @s1.path.should == @s2.path
-      @s1.path.should == ""
-    end
-
-    it "returns sockets with no address" do
-      @s1.addr.should == ["AF_UNIX", ""]
-      @s2.addr.should == ["AF_UNIX", ""]
-    end
-
-    it "returns sockets with no peeraddr" do
-      @s1.peeraddr.should == ["AF_UNIX", ""]
-      @s2.peeraddr.should == ["AF_UNIX", ""]
-    end
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/shared/pair.rb b/spec/ruby/library/socket/unixsocket/shared/pair.rb
new file mode 100644
index 0000000000..ade7fc9852
--- /dev/null
+++ b/spec/ruby/library/socket/unixsocket/shared/pair.rb
@@ -0,0 +1,29 @@
+require_relative '../../spec_helper'
+require_relative '../../fixtures/classes'
+
+describe :unixsocket_pair, shared: true do
+  it "returns two UNIXSockets" do
+    @s1.should be_an_instance_of(UNIXSocket)
+    @s2.should be_an_instance_of(UNIXSocket)
+  end
+
+  it "returns a pair of connected sockets" do
+    @s1.puts "foo"
+    @s2.gets.should == "foo\n"
+  end
+
+  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
diff --git a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
index 3e9646f76b..5f34008df3 100644
--- a/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/socketpair_spec.rb
@@ -1,40 +1,20 @@
 require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+require_relative '../shared/partially_closable_sockets'
+require_relative 'shared/pair'
 
 with_feature :unix_socket do
-  describe 'UNIXSocket.socketpair' do
-    before do
+  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 do
+    after :each do
       @s1.close
       @s2.close
     end
-
-    it 'returns two UNIXSockets' do
-      @s1.should be_an_instance_of(UNIXSocket)
-      @s2.should be_an_instance_of(UNIXSocket)
-    end
-
-    it 'connects the sockets to each other' do
-      @s1.write('hello')
-
-      @s2.recv(5).should == 'hello'
-    end
-
-    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
 end