Update to ruby/spec@83e26c9

5 files changed, 69 insertions, 44 deletions

diff --git a/spec/ruby/core/hash/compact_spec.rb b/spec/ruby/core/hash/compact_spec.rb
index 13371bce43..48f8bb7cae 100644
--- a/spec/ruby/core/hash/compact_spec.rb
+++ b/spec/ruby/core/hash/compact_spec.rb
@@ -19,28 +19,26 @@ describe "Hash#compact" do
     @hash.should == @initial_pairs
   end
 
-  ruby_version_is '3.3' do
-    it "retains the default value" do
-      hash = Hash.new(1)
-      hash.compact.default.should == 1
-      hash[:a] = 1
-      hash.compact.default.should == 1
-    end
+  it "retains the default value" do
+    hash = Hash.new(1)
+    hash.compact.default.should == 1
+    hash[:a] = 1
+    hash.compact.default.should == 1
+  end
 
-    it "retains the default_proc" do
-      pr = proc { |h, k| h[k] = [] }
-      hash = Hash.new(&pr)
-      hash.compact.default_proc.should == pr
-      hash[:a] = 1
-      hash.compact.default_proc.should == pr
-    end
+  it "retains the default_proc" do
+    pr = proc { |h, k| h[k] = [] }
+    hash = Hash.new(&pr)
+    hash.compact.default_proc.should == pr
+    hash[:a] = 1
+    hash.compact.default_proc.should == pr
+  end
 
-    it "retains compare_by_identity flag" do
-      hash = {}.compare_by_identity
-      hash.compact.compare_by_identity?.should == true
-      hash[:a] = 1
-      hash.compact.compare_by_identity?.should == true
-    end
+  it "retains compare_by_identity flag" do
+    hash = {}.compare_by_identity
+    hash.compact.compare_by_identity?.should == true
+    hash[:a] = 1
+    hash.compact.compare_by_identity?.should == true
   end
 end
 
diff --git a/spec/ruby/core/hash/constructor_spec.rb b/spec/ruby/core/hash/constructor_spec.rb
index 0f97f7b40e..301f8675ce 100644
--- a/spec/ruby/core/hash/constructor_spec.rb
+++ b/spec/ruby/core/hash/constructor_spec.rb
@@ -44,23 +44,23 @@ describe "Hash.[]" do
 
   it "raises for elements that are not arrays" do
     -> {
-      Hash[[:a]].should == {}
-    }.should raise_error(ArgumentError)
+      Hash[[:a]]
+    }.should raise_error(ArgumentError, "wrong element type Symbol at 0 (expected array)")
     -> {
-      Hash[[:nil]].should == {}
-    }.should raise_error(ArgumentError)
+      Hash[[nil]]
+    }.should raise_error(ArgumentError, "wrong element type nil at 0 (expected array)")
   end
 
   it "raises an ArgumentError for arrays of more than 2 elements" do
-    ->{ Hash[[[:a, :b, :c]]].should == {} }.should raise_error(ArgumentError)
+    ->{
+      Hash[[[:a, :b, :c]]]
+    }.should raise_error(ArgumentError, "invalid number of elements (3 for 1..2)")
   end
 
   it "raises an ArgumentError when passed a list of value-invalid-pairs in an array" do
     -> {
-      -> {
-        Hash[[[:a, 1], [:b], 42, [:d, 2], [:e, 2, 3], []]]
-      }.should complain(/ignoring wrong elements/)
-    }.should raise_error(ArgumentError)
+      Hash[[[:a, 1], [:b], 42, [:d, 2], [:e, 2, 3], []]]
+    }.should raise_error(ArgumentError, "wrong element type Integer at 2 (expected array)")
   end
 
   describe "passed a single argument which responds to #to_hash" do
@@ -117,13 +117,11 @@ describe "Hash.[]" do
     Hash[hash].default_proc.should be_nil
   end
 
-  ruby_version_is '3.3' do
-    it "does not retain compare_by_identity flag" do
-      hash = { a: 1 }.compare_by_identity
-      Hash[hash].compare_by_identity?.should == false
+  it "does not retain compare_by_identity flag" do
+    hash = { a: 1 }.compare_by_identity
+    Hash[hash].compare_by_identity?.should == false
 
-      hash = {}.compare_by_identity
-      Hash[hash].compare_by_identity?.should == false
-    end
+    hash = {}.compare_by_identity
+    Hash[hash].compare_by_identity?.should == false
   end
 end
diff --git a/spec/ruby/core/hash/new_spec.rb b/spec/ruby/core/hash/new_spec.rb
index 5ae3e1f98d..8de44ec941 100644
--- a/spec/ruby/core/hash/new_spec.rb
+++ b/spec/ruby/core/hash/new_spec.rb
@@ -34,7 +34,7 @@ describe "Hash.new" do
     -> { Hash.new(nil) { 0 } }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is "3.3"..."3.4" do
+  ruby_version_is ""..."3.4" do
     it "emits a deprecation warning if keyword arguments are passed" do
       -> { Hash.new(unknown: true) }.should complain(
         Regexp.new(Regexp.escape("Calling Hash.new with keyword arguments is deprecated and will be removed in Ruby 3.4; use Hash.new({ key: value }) instead"))
diff --git a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
index 7dbb9c0a98..ddf9038800 100644
--- a/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
+++ b/spec/ruby/core/hash/ruby2_keywords_hash_spec.rb
@@ -72,12 +72,10 @@ describe "Hash.ruby2_keywords_hash" do
     Hash.ruby2_keywords_hash(hash).default_proc.should == pr
   end
 
-  ruby_version_is '3.3' do
-    it "retains compare_by_identity_flag" do
-      hash = {}.compare_by_identity
-      Hash.ruby2_keywords_hash(hash).compare_by_identity?.should == true
-      hash[:a] = 1
-      Hash.ruby2_keywords_hash(hash).compare_by_identity?.should == true
-    end
+  it "retains compare_by_identity_flag" do
+    hash = {}.compare_by_identity
+    Hash.ruby2_keywords_hash(hash).compare_by_identity?.should == true
+    hash[:a] = 1
+    Hash.ruby2_keywords_hash(hash).compare_by_identity?.should == true
   end
 end
diff --git a/spec/ruby/core/hash/shared/to_s.rb b/spec/ruby/core/hash/shared/to_s.rb
index e116b8878b..38dd2c4436 100644
--- a/spec/ruby/core/hash/shared/to_s.rb
+++ b/spec/ruby/core/hash/shared/to_s.rb
@@ -89,5 +89,36 @@ describe :hash_to_s, shared: true do
     it "adds quotes to symbol keys that are not valid symbol literals" do
       { "needs-quotes": 1 }.send(@method).should == '{"needs-quotes": 1}'
     end
+
+    it "can be evaled" do
+      no_quote = '{a: 1, a!: 1, a?: 1}'
+      eval(no_quote).inspect.should == no_quote
+      [
+        '{"": 1}',
+        '{"0": 1, "!": 1, "%": 1, "&": 1, "*": 1, "+": 1, "-": 1, "/": 1, "<": 1, ">": 1, "^": 1, "`": 1, "|": 1, "~": 1}',
+        '{"@a": 1, "$a": 1, "+@": 1, "a=": 1, "[]": 1}',
+        '{"a\"b": 1, "@@a": 1, "<=>": 1, "===": 1, "[]=": 1}',
+      ].each do |quote|
+        eval(quote).inspect.should == quote
+      end
+    end
+
+    it "can be evaled when Encoding.default_external is changed" do
+      external = Encoding.default_external
+
+      Encoding.default_external = Encoding::ASCII
+      utf8_ascii_hash = '{"\\u3042": 1}'
+      eval(utf8_ascii_hash).inspect.should == utf8_ascii_hash
+
+      Encoding.default_external = Encoding::UTF_8
+      utf8_hash = "{\u3042: 1}"
+      eval(utf8_hash).inspect.should == utf8_hash
+
+      Encoding.default_external = Encoding::Windows_31J
+      sjis_hash = "{\x87]: 1}".dup.force_encoding('sjis')
+      eval(sjis_hash).inspect.should == sjis_hash
+    ensure
+      Encoding.default_external = external
+    end
   end
 end