11 files changed, 224 insertions, 56 deletions

diff --git a/spec/ruby/core/struct/constants_spec.rb b/spec/ruby/core/struct/constants_spec.rb
new file mode 100644
index 0000000000..7e8af1a211
--- /dev/null
+++ b/spec/ruby/core/struct/constants_spec.rb
@@ -0,0 +1,13 @@
+require_relative '../../spec_helper'
+
+describe "Struct::Group" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Group)
+  end
+end
+
+describe "Struct::Passwd" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Passwd)
+  end
+end
diff --git a/spec/ruby/core/struct/deconstruct_keys_spec.rb b/spec/ruby/core/struct/deconstruct_keys_spec.rb
index b4c84c49df..e16b50f930 100644
--- a/spec/ruby/core/struct/deconstruct_keys_spec.rb
+++ b/spec/ruby/core/struct/deconstruct_keys_spec.rb
@@ -40,6 +40,21 @@ describe "Struct#deconstruct_keys" do
     s.deconstruct_keys([0, 1, 2]).should == {0 => 10, 1 => 20, 2 => 30}
     s.deconstruct_keys([0, 1]   ).should == {0 => 10, 1 => 20}
     s.deconstruct_keys([0]      ).should == {0 => 10}
+    s.deconstruct_keys([-1]     ).should == {-1 => 30}
+  end
+
+  it "ignores incorrect position numbers" do
+    struct = Struct.new(:x, :y, :z)
+    s = struct.new(10, 20, 30)
+
+    s.deconstruct_keys([0, 3]).should == {0 => 10}
+  end
+
+  it "support mixing attribute names and argument position numbers" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([0, :x]).should == {0 => 1, :x => 1}
   end
 
   it "returns an empty hash when there are more keys than attributes" do
@@ -57,6 +72,14 @@ describe "Struct#deconstruct_keys" do
     s.deconstruct_keys([:x, :a]).should == {x: 1}
   end
 
+  it "returns at first not existing argument position number" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([3, 0]).should == {}
+    s.deconstruct_keys([0, 3]).should == {0 => 1}
+  end
+
   it "accepts nil argument and return all the attributes" do
     struct = Struct.new(:x, :y)
     obj = struct.new(1, 2)
@@ -64,6 +87,37 @@ describe "Struct#deconstruct_keys" do
     obj.deconstruct_keys(nil).should == {x: 1, y: 2}
   end
 
+  it "tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return(1)
+
+    s.deconstruct_keys([key]).should == { key => 2 }
+  end
+
+  it "raises a TypeError if the conversion with #to_int does not return an Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return("not an Integer")
+
+    -> {
+      s.deconstruct_keys([key])
+    }.should raise_error(TypeError, /can't convert MockObject to Integer/)
+  end
+
+  it "raises TypeError if index is not a String, a Symbol and not convertible to Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    -> {
+      s.deconstruct_keys([0, []])
+    }.should raise_error(TypeError, "no implicit conversion of Array into Integer")
+  end
+
   it "raise TypeError if passed anything except nil or array" do
     struct = Struct.new(:x, :y)
     s = struct.new(1, 2)
diff --git a/spec/ruby/core/struct/element_set_spec.rb b/spec/ruby/core/struct/element_set_spec.rb
index 6ba7b081a9..0a0e34a5ee 100644
--- a/spec/ruby/core/struct/element_set_spec.rb
+++ b/spec/ruby/core/struct/element_set_spec.rb
@@ -26,4 +26,11 @@ describe "Struct#[]=" do
     -> { car[-4] = true         }.should raise_error(IndexError)
     -> { car[Object.new] = true }.should raise_error(TypeError)
   end
+
+  it "raises a FrozenError on a frozen struct" do
+    car = StructClasses::Car.new('Ford', 'Ranger')
+    car.freeze
+
+    -> { car[:model] = 'Escape' }.should raise_error(FrozenError)
+  end
 end
diff --git a/spec/ruby/core/struct/fixtures/classes.rb b/spec/ruby/core/struct/fixtures/classes.rb
index 6d620f9060..7b80b814ef 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
 
@@ -23,4 +29,6 @@ module StructClasses
       super
     end
   end
+
+  class StructSubclass < Struct; end
 end
diff --git a/spec/ruby/core/struct/initialize_spec.rb b/spec/ruby/core/struct/initialize_spec.rb
index a5ebe9551c..06055594d5 100644
--- a/spec/ruby/core/struct/initialize_spec.rb
+++ b/spec/ruby/core/struct/initialize_spec.rb
@@ -41,21 +41,11 @@ describe "Struct#initialize" do
     StructClasses::SubclassX.new(:y).new.key.should == :value
   end
 
-  ruby_version_is "3.1"..."3.2" do
-    it "warns about passing only keyword arguments" do
-      -> {
-        StructClasses::Ruby.new(version: "3.1", platform: "OS")
-      }.should complain(/warning: Passing only keyword arguments/)
-    end
-  end
+  it "can be initialized with keyword arguments" do
+    positional_args = StructClasses::Ruby.new("3.2", "OS")
+    keyword_args = StructClasses::Ruby.new(version: "3.2", platform: "OS")
 
-  ruby_version_is "3.2" do
-    it "can be initialized with keyword arguments" do
-      positional_args = StructClasses::Ruby.new("3.2", "OS")
-      keyword_args = StructClasses::Ruby.new(version: "3.2", platform: "OS")
-
-      positional_args.version.should == keyword_args.version
-      positional_args.platform.should == keyword_args.platform
-    end
+    positional_args.version.should == keyword_args.version
+    positional_args.platform.should == keyword_args.platform
   end
 end
diff --git a/spec/ruby/core/struct/keyword_init_spec.rb b/spec/ruby/core/struct/keyword_init_spec.rb
index 061f4c56e0..536b82041a 100644
--- a/spec/ruby/core/struct/keyword_init_spec.rb
+++ b/spec/ruby/core/struct/keyword_init_spec.rb
@@ -1,21 +1,45 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-ruby_version_is "3.1" do
-  # See https://bugs.ruby-lang.org/issues/18008
-  describe "StructClass#keyword_init?" do
-    it "returns true for a struct that accepts keyword arguments to initialize" do
-      struct = Struct.new(:arg, keyword_init: true)
-      struct.keyword_init?.should be_true
-    end
+# See https://bugs.ruby-lang.org/issues/18008
+describe "StructClass#keyword_init?" do
+  it "returns true for a struct that accepts keyword arguments to initialize" do
+    struct = Struct.new(:arg, keyword_init: true)
+    struct.keyword_init?.should be_true
+  end
 
-    it "returns false for a struct that does not accept keyword arguments to initialize" do
-      struct = Struct.new(:arg, keyword_init: false)
-      struct.keyword_init?.should be_false
-    end
+  it "returns false for a struct that does not accept keyword arguments to initialize" do
+    struct = Struct.new(:arg, keyword_init: false)
+    struct.keyword_init?.should be_false
+  end
+
+  it "returns nil for a struct that did not explicitly specify keyword_init" 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
 
-    it "returns nil for a struct that did not explicitly specify keyword_init" do
-      struct = Struct.new(:arg)
-      struct.keyword_init?.should be_nil
+  context "class inheriting Struct" do
+    it "isn't available in a subclass" do
+      StructClasses::StructSubclass.should_not.respond_to?(:keyword_init?)
     end
   end
 end
diff --git a/spec/ruby/core/struct/members_spec.rb b/spec/ruby/core/struct/members_spec.rb
index 1f2ff950d9..1ff7b9387a 100644
--- a/spec/ruby/core/struct/members_spec.rb
+++ b/spec/ruby/core/struct/members_spec.rb
@@ -11,3 +11,15 @@ describe "Struct#members" do
 
   it_behaves_like :struct_accessor, :members
 end
+
+describe "StructClass#members" do
+  it "returns an array of attribute names" do
+    StructClasses::Car.members.should == [:make, :model, :year]
+  end
+
+  context "class inheriting Struct" do
+    it "isn't available in a subclass" do
+      StructClasses::StructSubclass.should_not.respond_to?(:members)
+    end
+  end
+end
diff --git a/spec/ruby/core/struct/new_spec.rb b/spec/ruby/core/struct/new_spec.rb
index 7b4a4f7980..1d35de7b87 100644
--- a/spec/ruby/core/struct/new_spec.rb
+++ b/spec/ruby/core/struct/new_spec.rb
@@ -6,6 +6,8 @@ describe "Struct.new" do
     struct = Struct.new('Animal', :name, :legs, :eyeballs)
     struct.should == Struct::Animal
     struct.name.should == "Struct::Animal"
+  ensure
+    Struct.send(:remove_const, :Animal)
   end
 
   it "overwrites previously defined constants with string as first argument" do
@@ -19,6 +21,8 @@ describe "Struct.new" do
     second.should == Struct::Person
 
     first.members.should_not == second.members
+  ensure
+    Struct.send(:remove_const, :Person)
   end
 
   it "calls to_str on its first argument (constant name)" do
@@ -27,6 +31,8 @@ describe "Struct.new" do
     struct = Struct.new(obj)
     struct.should == Struct::Foo
     struct.name.should == "Struct::Foo"
+  ensure
+    Struct.send(:remove_const, :Foo)
   end
 
   it "creates a new anonymous class with nil first argument" do
@@ -47,6 +53,11 @@ describe "Struct.new" do
     Struct.const_defined?("Animal2").should be_false
   end
 
+  it "allows non-ASCII member name" do
+    name = "r\xe9sum\xe9".dup.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)
@@ -62,19 +73,21 @@ describe "Struct.new" do
     -> { Struct.new(:animal, ['chris', 'evan'])    }.should raise_error(TypeError)
   end
 
-  ruby_version_is ""..."3.2" do
-    it "raises a TypeError or ArgumentError if passed a Hash with an unknown key" do
-      # CRuby < 3.2 raises ArgumentError: unknown keyword: :name, but that seems a bug:
-      # https://bugs.ruby-lang.org/issues/18632
-      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(StandardError) { |e|
-        [ArgumentError, TypeError].should.include?(e.class)
-      }
+  it "raises a TypeError if passed a Hash with an unknown key" do
+    -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
+  end
+
+  ruby_version_is ""..."3.3" do
+    it "raises ArgumentError if not provided any arguments" do
+      -> { Struct.new }.should raise_error(ArgumentError)
     end
   end
 
-  ruby_version_is "3.2" do
-    it "raises a TypeError if passed a Hash with an unknown key" do
-      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
+  ruby_version_is "3.3" do
+    it "works when not provided any arguments" do
+      c = Struct.new
+      c.should be_kind_of(Class)
+      c.superclass.should == Struct
     end
   end
 
@@ -119,6 +132,8 @@ describe "Struct.new" do
     it "creates a constant in subclass' namespace" do
       struct = StructClasses::Apple.new('Computer', :size)
       struct.should == StructClasses::Apple::Computer
+    ensure
+      StructClasses::Apple.send(:remove_const, :Computer)
     end
 
     it "creates an instance" do
@@ -139,29 +154,43 @@ describe "Struct.new" do
       -> { StructClasses::Ruby.new('2.0', 'i686', true) }.should raise_error(ArgumentError)
     end
 
-    ruby_version_is ''...'3.1' do
-      it "passes a hash as a normal argument" do
-        type = Struct.new(:args)
+    it "accepts keyword arguments to initialize" do
+      type = Struct.new(:args)
 
-        obj = suppress_warning {type.new(keyword: :arg)}
-        obj2 = type.new(*[{keyword: :arg}])
+      obj = type.new(args: 42)
+      obj2 = type.new(42)
 
-        obj.should == obj2
-        obj.args.should == {keyword: :arg}
-        obj2.args.should == {keyword: :arg}
-      end
+      obj.should == obj2
+      obj.args.should == 42
+      obj2.args.should == 42
     end
 
-    ruby_version_is '3.2' do
-      it "accepts keyword arguments to initialize" do
-        type = Struct.new(:args)
+    context "given positional and keyword arguments" do
+      it "treats keyword arguments as a positional parameter" do
+        type = Struct.new(:a, :b)
+        s = type.new("a", b: "b")
+        s.a.should == "a"
+        s.b.should == {b: "b"}
+
+        type = Struct.new(:a, :b, :c)
+        s = type.new("a", b: "b", c: "c")
+        s.a.should == "a"
+        s.b.should == {b: "b", c: "c"}
+        s.c.should == nil
+      end
+
+      it "ignores empty keyword arguments" do
+        type = Struct.new(:a, :b)
+        h = {}
+        s = type.new("a", **h)
 
-        obj = type.new(args: 42)
-        obj2 = type.new(42)
+        s.a.should == "a"
+        s.b.should == nil
+      end
 
-        obj.should == obj2
-        obj.args.should == 42
-        obj2.args.should == 42
+      it "raises ArgumentError when all struct attribute values are specified" do
+        type = Struct.new(:a, :b)
+        -> { type.new("a", "b", c: "c") }.should raise_error(ArgumentError, "struct size differs")
       end
     end
   end
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
diff --git a/spec/ruby/core/struct/struct_spec.rb b/spec/ruby/core/struct/struct_spec.rb
index 8817dc1a58..1b6a4488ce 100644
--- a/spec/ruby/core/struct/struct_spec.rb
+++ b/spec/ruby/core/struct/struct_spec.rb
@@ -33,6 +33,13 @@ describe "Struct anonymous class instance methods" do
     car['model'].should == 'F150'
     car[1].should == 'F150'
   end
+
+  it "writer methods raise a FrozenError on a frozen struct" do
+    car = StructClasses::Car.new('Ford', 'Ranger')
+    car.freeze
+
+    -> { car.model = 'Escape' }.should raise_error(FrozenError)
+  end
 end
 
 describe "Struct subclasses" do
diff --git a/spec/ruby/core/struct/to_h_spec.rb b/spec/ruby/core/struct/to_h_spec.rb
index bfb0af07ba..861ce3f49d 100644
--- a/spec/ruby/core/struct/to_h_spec.rb
+++ b/spec/ruby/core/struct/to_h_spec.rb
@@ -21,6 +21,18 @@ describe "Struct#to_h" do
       h.should == { "make" => "ford", "model" => "ranger", "year" => "" }
     end
 
+    it "passes to a block each pair's key and value as separate arguments" do
+      s = StructClasses::Ruby.new('3.2.4', 'macos')
+
+      ScratchPad.record []
+      s.to_h { |k, v| ScratchPad << [k, v]; [k, v] }
+      ScratchPad.recorded.sort.should == [[:platform, 'macos'], [:version, '3.2.4']]
+
+      ScratchPad.record []
+      s.to_h { |*args| ScratchPad << args; [args[0], args[1]] }
+      ScratchPad.recorded.sort.should == [[:platform, 'macos'], [:version, '3.2.4']]
+    end
+
     it "raises ArgumentError if block returns longer or shorter array" do
       -> do
         StructClasses::Car.new.to_h { |k, v| [k.to_s, "#{v}".downcase, 1] }