1 files changed, 36 insertions, 25 deletions
diff --git a/spec/ruby/core/enumerable/tally_spec.rb b/spec/ruby/core/enumerable/tally_spec.rb
index 92aac507ff..e0edc8dc75 100644
--- a/spec/ruby/core/enumerable/tally_spec.rb
+++ b/spec/ruby/core/enumerable/tally_spec.rb
@@ -1,36 +1,34 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is "2.7" do
-  describe "Enumerable#tally" do
-    before :each do
-      ScratchPad.record []
-    end
+describe "Enumerable#tally" do
+  before :each do
+    ScratchPad.record []
+  end
 
-    it "returns a hash with counts according to the value" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
+  it "returns a hash with counts according to the value" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
 
-    it "returns a hash without default" do
-      hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
-      hash.default_proc.should be_nil
-      hash.default.should be_nil
-    end
+  it "returns a hash without default" do
+    hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
+    hash.default_proc.should be_nil
+    hash.default.should be_nil
+  end
 
-    it "returns an empty hash for empty enumerables" do
-      EnumerableSpecs::Empty.new.tally.should == {}
-    end
+  it "returns an empty hash for empty enumerables" do
+    EnumerableSpecs::Empty.new.tally.should == {}
+  end
 
-    it "counts values as gathered array when yielded with multiple arguments" do
-      EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
-    end
+  it "counts values as gathered array when yielded with multiple arguments" do
+    EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
+  end
 
-    it "does not call given block" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally { |v| ScratchPad << v }
-      ScratchPad.recorded.should == []
-    end
+  it "does not call given block" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally { |v| ScratchPad << v }
+    ScratchPad.recorded.should == []
   end
 end
 
@@ -51,6 +49,13 @@ ruby_version_is "3.1" do
       enum.tally(hash).should equal(hash)
     end
 
+    it "calls #to_hash to convert argument to Hash implicitly if passed not a Hash" do
+      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+      object = Object.new
+      def object.to_hash; { 'foo' => 1 }; end
+      enum.tally(object).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
+    end
+
     it "raises a FrozenError and does not update the given hash when the hash is frozen" do
       enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
       hash = { 'foo' => 1 }.freeze
@@ -58,6 +63,12 @@ ruby_version_is "3.1" do
       hash.should == { 'foo' => 1 }
     end
 
+    it "raises a FrozenError even if enumerable is empty" do
+      enum = EnumerableSpecs::Numerous.new()
+      hash = { 'foo' => 1 }.freeze
+      -> { enum.tally(hash) }.should raise_error(FrozenError)
+    end
+
     it "does not call given block" do
       enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
       enum.tally({ 'foo' => 1 }) { |v| ScratchPad << v }