Update to ruby/spec@7f69c86

4 files changed, 42 insertions, 0 deletions

diff --git a/spec/ruby/core/struct/fixtures/classes.rb b/spec/ruby/core/struct/fixtures/classes.rb
index 6d620f9060..bf838d05df 100644
--- a/spec/ruby/core/struct/fixtures/classes.rb
+++ b/spec/ruby/core/struct/fixtures/classes.rb
@@ -13,6 +13,12 @@ module StructClasses
     end
   end
 
+  class StructWithOverriddenName < Struct.new(:a)
+    def self.name
+      "A"
+    end
+  end
+
   class SubclassX < Struct
   end
 
diff --git a/spec/ruby/core/struct/keyword_init_spec.rb b/spec/ruby/core/struct/keyword_init_spec.rb
index 061f4c56e0..8de4c14351 100644
--- a/spec/ruby/core/struct/keyword_init_spec.rb
+++ b/spec/ruby/core/struct/keyword_init_spec.rb
@@ -17,5 +17,24 @@ ruby_version_is "3.1" do
       struct = Struct.new(:arg)
       struct.keyword_init?.should be_nil
     end
+
+    it "returns nil for a struct that does specify keyword_init to be nil" do
+      struct = Struct.new(:arg, keyword_init: nil)
+      struct.keyword_init?.should be_nil
+    end
+
+    it "returns true for any truthy value, not just for true" do
+      struct = Struct.new(:arg, keyword_init: 1)
+      struct.keyword_init?.should be_true
+
+      struct = Struct.new(:arg, keyword_init: "")
+      struct.keyword_init?.should be_true
+
+      struct = Struct.new(:arg, keyword_init: [])
+      struct.keyword_init?.should be_true
+
+      struct = Struct.new(:arg, keyword_init: {})
+      struct.keyword_init?.should be_true
+    end
   end
 end
diff --git a/spec/ruby/core/struct/new_spec.rb b/spec/ruby/core/struct/new_spec.rb
index 4aeaa066e1..8758051a81 100644
--- a/spec/ruby/core/struct/new_spec.rb
+++ b/spec/ruby/core/struct/new_spec.rb
@@ -47,6 +47,11 @@ describe "Struct.new" do
     Struct.const_defined?("Animal2").should be_false
   end
 
+  it "allows non-ASCII member name" do
+    name = "r\xe9sum\xe9".force_encoding(Encoding::ISO_8859_1).to_sym
+    struct = Struct.new(name)
+    struct.new("foo").send(name).should == "foo"
+  end
 
   it "fails with invalid constant name as first argument" do
     -> { Struct.new('animal', :name, :legs, :eyeballs) }.should raise_error(NameError)
diff --git a/spec/ruby/core/struct/shared/inspect.rb b/spec/ruby/core/struct/shared/inspect.rb
index e65a4fb45d..1a0fb6a6b2 100644
--- a/spec/ruby/core/struct/shared/inspect.rb
+++ b/spec/ruby/core/struct/shared/inspect.rb
@@ -25,4 +25,16 @@ describe :struct_inspect, shared: true do
 
     m::Foo.new("").send(@method).should == '#<struct a="">'
   end
+
+  it "does not call #name method" do
+    struct = StructClasses::StructWithOverriddenName.new("")
+    struct.send(@method).should == '#<struct StructClasses::StructWithOverriddenName a="">'
+  end
+
+  it "does not call #name method when struct is anonymous" do
+    struct = Struct.new(:a)
+    def struct.name; "A"; end
+
+    struct.new("").send(@method).should == '#<struct a="">'
+  end
 end