Update to ruby/spec@f8987ac

author: Andrew Konchin <[email protected]> 2024-07-01 15:38:25 +0300
committer: Benoit Daloze <[email protected]> 2024-07-02 13:33:48 +0200
commit: cee62c6738c42ce774e96e180cf2d46afb8e9cbe (patch)
tree: 52a37ef94e90f99f8471dbba4d6659ca5dc6c532 /spec/ruby/library
parent: d7af8afe1b85b8de04cd77c673b0f6ef3f3627fa (diff)
12 files changed, 107 insertions, 56 deletions
diff --git a/spec/ruby/library/coverage/fixtures/code_with_begin.rb b/spec/ruby/library/coverage/fixtures/code_with_begin.rb
new file mode 100644
index 0000000000..9a6384e337
--- /dev/null
+++ b/spec/ruby/library/coverage/fixtures/code_with_begin.rb
@@ -0,0 +1,3 @@
+begin
+  'coverage with begin'
+end
diff --git a/spec/ruby/library/coverage/result_spec.rb b/spec/ruby/library/coverage/result_spec.rb
index 33276778e8..54a3249e45 100644
--- a/spec/ruby/library/coverage/result_spec.rb
+++ b/spec/ruby/library/coverage/result_spec.rb
@@ -6,6 +6,7 @@ describe 'Coverage.result' do
     @class_file = fixture __FILE__, 'some_class.rb'
     @config_file = fixture __FILE__, 'start_coverage.rb'
     @eval_code_file = fixture __FILE__, 'eval_code.rb'
+    @with_begin_file = fixture __FILE__, 'code_with_begin.rb'
   end
 
   before :each do
@@ -16,6 +17,7 @@ describe 'Coverage.result' do
     $LOADED_FEATURES.delete(@class_file)
     $LOADED_FEATURES.delete(@config_file)
     $LOADED_FEATURES.delete(@eval_code_file)
+    $LOADED_FEATURES.delete(@with_begin_file)
 
     Coverage.result if Coverage.running?
   end
@@ -354,4 +356,16 @@ describe 'Coverage.result' do
 
     Coverage.peek_result.should == result
   end
+
+  it 'covers 100% lines with begin' do
+    Coverage.start
+    require @with_begin_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @with_begin_file => [
+        nil, 1, nil
+      ]
+    }
+  end
 end
diff --git a/spec/ruby/library/date/accessor_spec.rb b/spec/ruby/library/date/accessor_spec.rb
index 68a2d9f3de..74ed0e9c21 100644
--- a/spec/ruby/library/date/accessor_spec.rb
+++ b/spec/ruby/library/date/accessor_spec.rb
@@ -38,7 +38,7 @@ describe "Date#year" do
 end
 
 describe "Date#yday" do
-  it "determines the year" do
+  it "determines the day of the year" do
     Date.civil(2007,  1, 17).yday.should == 17
     Date.civil(2008, 10, 28).yday.should == 302
   end
diff --git a/spec/ruby/library/date/yday_spec.rb b/spec/ruby/library/date/yday_spec.rb
index cfb174a4c2..7dd42e52a5 100644
--- a/spec/ruby/library/date/yday_spec.rb
+++ b/spec/ruby/library/date/yday_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
+require_relative '../../shared/time/yday'
 require 'date'
 
 describe "Date#yday" do
-  it "needs to be reviewed for spec completeness"
+  it_behaves_like :time_yday, -> year, month, day { Date.new(year, month, day).yday }
 end
diff --git a/spec/ruby/library/datetime/yday_spec.rb b/spec/ruby/library/datetime/yday_spec.rb
new file mode 100644
index 0000000000..08a72c6480
--- /dev/null
+++ b/spec/ruby/library/datetime/yday_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/time/yday'
+require 'date'
+
+describe "DateTime#yday" do
+  it_behaves_like :time_yday, -> year, month, day { DateTime.new(year, month, day).yday }
+end
diff --git a/spec/ruby/library/net-ftp/shared/puttextfile.rb b/spec/ruby/library/net-ftp/shared/puttextfile.rb
index 27d7017d9e..e2c0453352 100644
--- a/spec/ruby/library/net-ftp/shared/puttextfile.rb
+++ b/spec/ruby/library/net-ftp/shared/puttextfile.rb
@@ -34,6 +34,18 @@ describe :net_ftp_puttextfile, shared: true do
     remote_lines.should == local_lines.gsub("\n", "\r\n")
   end
 
+  guard -> { Net::FTP::VERSION < '0.3.6' } do
+    it "returns nil" do
+      @ftp.send(@method, @local_fixture_file, "text").should be_nil
+    end
+  end
+
+  guard -> { Net::FTP::VERSION >= '0.3.6' } do
+    it "returns the response" do
+      @ftp.send(@method, @local_fixture_file, "text").should == @ftp.last_response
+    end
+  end
+
   describe "when passed a block" do
     it "yields each transmitted line" do
       res = []
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
diff --git a/spec/ruby/library/stringio/initialize_spec.rb b/spec/ruby/library/stringio/initialize_spec.rb
index ad067a0be1..6f4d2e456c 100644
--- a/spec/ruby/library/stringio/initialize_spec.rb
+++ b/spec/ruby/library/stringio/initialize_spec.rb
@@ -130,6 +130,26 @@ describe "StringIO#initialize when passed [Object, mode]" do
     -> { @io.send(:initialize, str, "w") }.should raise_error(Errno::EACCES)
     -> { @io.send(:initialize, str, "a") }.should raise_error(Errno::EACCES)
   end
+
+  it "truncates all the content if passed w mode" do
+    io = StringIO.allocate
+    source = +"example".encode(Encoding::ISO_8859_1);
+
+    io.send(:initialize, source, "w")
+
+    io.string.should.empty?
+    io.string.encoding.should == Encoding::ISO_8859_1
+  end
+
+  it "truncates all the content if passed IO::TRUNC mode" do
+    io = StringIO.allocate
+    source = +"example".encode(Encoding::ISO_8859_1);
+
+    io.send(:initialize, source, IO::TRUNC)
+
+    io.string.should.empty?
+    io.string.encoding.should == Encoding::ISO_8859_1
+  end
 end
 
 describe "StringIO#initialize when passed [Object]" do
@@ -172,7 +192,7 @@ end
 # NOTE: Synchronise with core/io/new_spec.rb (core/io/shared/new.rb)
 describe "StringIO#initialize when passed keyword arguments" do
   it "sets the mode based on the passed :mode option" do
-    io = StringIO.new("example", "r")
+    io = StringIO.new("example", mode: "r")
     io.closed_read?.should be_false
     io.closed_write?.should be_true
   end
diff --git a/spec/ruby/library/stringscanner/scan_until_spec.rb b/spec/ruby/library/stringscanner/scan_until_spec.rb
index 6b7782572d..a8162f1f03 100644
--- a/spec/ruby/library/stringscanner/scan_until_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_until_spec.rb
@@ -7,9 +7,9 @@ describe "StringScanner#scan_until" do
   end
 
   it "returns the substring up to and including the end of the match" do
-   @s.scan_until(/a/).should == "This is a"
-   @s.pre_match.should == "This is "
-   @s.post_match.should == " test"
+    @s.scan_until(/a/).should == "This is a"
+    @s.pre_match.should == "This is "
+    @s.post_match.should == " test"
   end
 
   it "returns nil if there's no match" do
author	Andrew Konchin <[email protected]>	2024-07-01 15:38:25 +0300
committer	Benoit Daloze <[email protected]>	2024-07-02 13:33:48 +0200
commit	cee62c6738c42ce774e96e180cf2d46afb8e9cbe (patch)
tree	52a37ef94e90f99f8471dbba4d6659ca5dc6c532 /spec/ruby/library
parent	d7af8afe1b85b8de04cd77c673b0f6ef3f3627fa (diff)