From 6998d758248d778fa95b008c78d05473e48b8428 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Thu, 29 Jul 2021 22:11:21 +0200
Subject: Update to ruby/spec@b65d01f

---
 spec/ruby/core/struct/filter_spec.rb | 10 ++---
 spec/ruby/core/struct/to_h_spec.rb   | 78 ++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 46 deletions(-)

(limited to 'spec/ruby/core/struct')

diff --git a/spec/ruby/core/struct/filter_spec.rb b/spec/ruby/core/struct/filter_spec.rb
index 1105ed064a..0ccd8ad6b2 100644
--- a/spec/ruby/core/struct/filter_spec.rb
+++ b/spec/ruby/core/struct/filter_spec.rb
@@ -3,10 +3,8 @@ require_relative 'shared/select'
 require_relative 'shared/accessor'
 require_relative '../enumerable/shared/enumeratorized'
 
-ruby_version_is "2.6" do
-  describe "Struct#filter" do
-    it_behaves_like :struct_select, :filter
-    it_behaves_like :struct_accessor, :filter
-    it_behaves_like :enumeratorized_with_origin_size, :filter, Struct.new(:foo).new
-  end
+describe "Struct#filter" do
+  it_behaves_like :struct_select, :filter
+  it_behaves_like :struct_accessor, :filter
+  it_behaves_like :enumeratorized_with_origin_size, :filter, Struct.new(:foo).new
 end
diff --git a/spec/ruby/core/struct/to_h_spec.rb b/spec/ruby/core/struct/to_h_spec.rb
index b5f4e40701..bfb0af07ba 100644
--- a/spec/ruby/core/struct/to_h_spec.rb
+++ b/spec/ruby/core/struct/to_h_spec.rb
@@ -13,46 +13,44 @@ describe "Struct#to_h" do
     car.make.should == 'Ford'
   end
 
-  ruby_version_is "2.6" do
-    context "with block" do
-      it "converts [key, value] pairs returned by the block to a hash" do
-        car = StructClasses::Car.new('Ford', 'Ranger')
-
-        h = car.to_h { |k, v| [k.to_s, "#{v}".downcase] }
-        h.should == { "make" => "ford", "model" => "ranger", "year" => "" }
-      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] }
-        end.should raise_error(ArgumentError, /element has wrong array length/)
-
-        -> do
-          StructClasses::Car.new.to_h { |k, v| [k] }
-        end.should raise_error(ArgumentError, /element has wrong array length/)
-      end
-
-      it "raises TypeError if block returns something other than Array" do
-        -> do
-          StructClasses::Car.new.to_h { |k, v| "not-array" }
-        end.should raise_error(TypeError, /wrong element type String/)
-      end
-
-      it "coerces returned pair to Array with #to_ary" do
-        x = mock('x')
-        x.stub!(:to_ary).and_return([:b, 'b'])
-
-        StructClasses::Car.new.to_h { |k| x }.should == { :b => 'b' }
-      end
-
-      it "does not coerce returned pair to Array with #to_a" do
-        x = mock('x')
-        x.stub!(:to_a).and_return([:b, 'b'])
-
-        -> do
-          StructClasses::Car.new.to_h { |k| x }
-        end.should raise_error(TypeError, /wrong element type MockObject/)
-      end
+  context "with block" do
+    it "converts [key, value] pairs returned by the block to a hash" do
+      car = StructClasses::Car.new('Ford', 'Ranger')
+
+      h = car.to_h { |k, v| [k.to_s, "#{v}".downcase] }
+      h.should == { "make" => "ford", "model" => "ranger", "year" => "" }
+    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] }
+      end.should raise_error(ArgumentError, /element has wrong array length/)
+
+      -> do
+        StructClasses::Car.new.to_h { |k, v| [k] }
+      end.should raise_error(ArgumentError, /element has wrong array length/)
+    end
+
+    it "raises TypeError if block returns something other than Array" do
+      -> do
+        StructClasses::Car.new.to_h { |k, v| "not-array" }
+      end.should raise_error(TypeError, /wrong element type String/)
+    end
+
+    it "coerces returned pair to Array with #to_ary" do
+      x = mock('x')
+      x.stub!(:to_ary).and_return([:b, 'b'])
+
+      StructClasses::Car.new.to_h { |k| x }.should == { :b => 'b' }
+    end
+
+    it "does not coerce returned pair to Array with #to_a" do
+      x = mock('x')
+      x.stub!(:to_a).and_return([:b, 'b'])
+
+      -> do
+        StructClasses::Car.new.to_h { |k| x }
+      end.should raise_error(TypeError, /wrong element type MockObject/)
     end
   end
 end
-- 
cgit v1.2.3