1 files changed, 57 insertions, 59 deletions
diff --git a/spec/ruby/core/enumerable/tally_spec.rb b/spec/ruby/core/enumerable/tally_spec.rb
index e0edc8dc75..deef741407 100644
--- a/spec/ruby/core/enumerable/tally_spec.rb
+++ b/spec/ruby/core/enumerable/tally_spec.rb
@@ -13,8 +13,8 @@ describe "Enumerable#tally" do
 
   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
+    hash.default_proc.should == nil
+    hash.default.should == nil
   end
 
   it "returns an empty hash for empty enumerables" do
@@ -32,62 +32,60 @@ describe "Enumerable#tally" do
   end
 end
 
-ruby_version_is "3.1" do
-  describe "Enumerable#tally with a hash" 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({ 'foo' => 1 }).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "returns the given hash" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      hash = { 'foo' => 1 }
-      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
-      -> { enum.tally(hash) }.should raise_error(FrozenError)
-      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 }
-      ScratchPad.recorded.should == []
-    end
-
-    it "ignores the default value" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally(Hash.new(100)).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "ignores the default proc" do
-      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
-      enum.tally(Hash.new {100}).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
-    end
-
-    it "needs the values counting each elements to be an integer" do
-      enum = EnumerableSpecs::Numerous.new('foo')
-      -> { enum.tally({ 'foo' => 'bar' }) }.should raise_error(TypeError)
-    end
+describe "Enumerable#tally with a hash" 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({ 'foo' => 1 }).should == { 'foo' => 3, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "returns the given hash" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    hash = { 'foo' => 1 }
+    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
+    -> { enum.tally(hash) }.should.raise(FrozenError)
+    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(FrozenError)
+  end
+
+  it "does not call given block" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally({ 'foo' => 1 }) { |v| ScratchPad << v }
+    ScratchPad.recorded.should == []
+  end
+
+  it "ignores the default value" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally(Hash.new(100)).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "ignores the default proc" do
+    enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+    enum.tally(Hash.new {100}).should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+  end
+
+  it "needs the values counting each elements to be an integer" do
+    enum = EnumerableSpecs::Numerous.new('foo')
+    -> { enum.tally({ 'foo' => 'bar' }) }.should.raise(TypeError)
   end
 end