Update to ruby/spec@83e26c9

2 files changed, 64 insertions, 68 deletions

diff --git a/spec/ruby/core/fiber/kill_spec.rb b/spec/ruby/core/fiber/kill_spec.rb
index 2f4c499280..abf23ff176 100644
--- a/spec/ruby/core/fiber/kill_spec.rb
+++ b/spec/ruby/core/fiber/kill_spec.rb
@@ -2,89 +2,87 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative '../../shared/kernel/raise'
 
-ruby_version_is "3.3" do
-  describe "Fiber#kill" do
-    it "kills a non-resumed fiber" do
-      fiber = Fiber.new{}
+describe "Fiber#kill" do
+  it "kills a non-resumed fiber" do
+    fiber = Fiber.new{}
 
-      fiber.alive?.should == true
+    fiber.alive?.should == true
 
-      fiber.kill
-      fiber.alive?.should == false
-    end
-
-    it "kills a resumed fiber" do
-      fiber = Fiber.new{while true; Fiber.yield; end}
-      fiber.resume
-
-      fiber.alive?.should == true
+    fiber.kill
+    fiber.alive?.should == false
+  end
 
-      fiber.kill
-      fiber.alive?.should == false
-    end
+  it "kills a resumed fiber" do
+    fiber = Fiber.new{while true; Fiber.yield; end}
+    fiber.resume
 
-    it "can kill itself" do
-      fiber = Fiber.new do
-        Fiber.current.kill
-      end
+    fiber.alive?.should == true
 
-      fiber.alive?.should == true
+    fiber.kill
+    fiber.alive?.should == false
+  end
 
-      fiber.resume
-      fiber.alive?.should == false
+  it "can kill itself" do
+    fiber = Fiber.new do
+      Fiber.current.kill
     end
 
-    it "kills a resumed fiber from a child" do
-      parent = Fiber.new do
-        child = Fiber.new do
-          parent.kill
-          parent.alive?.should == true
-        end
+    fiber.alive?.should == true
+
+    fiber.resume
+    fiber.alive?.should == false
+  end
 
-        child.resume
+  it "kills a resumed fiber from a child" do
+    parent = Fiber.new do
+      child = Fiber.new do
+        parent.kill
+        parent.alive?.should == true
       end
 
-      parent.resume
-      parent.alive?.should == false
+      child.resume
     end
 
-    it "executes the ensure block" do
-      ensure_executed = false
+    parent.resume
+    parent.alive?.should == false
+  end
 
-      fiber = Fiber.new do
-        while true; Fiber.yield; end
-      ensure
-        ensure_executed = true
-      end
+  it "executes the ensure block" do
+    ensure_executed = false
 
-      fiber.resume
-      fiber.kill
-      ensure_executed.should == true
+    fiber = Fiber.new do
+      while true; Fiber.yield; end
+    ensure
+      ensure_executed = true
     end
 
-    it "does not execute rescue block" do
-      rescue_executed = false
+    fiber.resume
+    fiber.kill
+    ensure_executed.should == true
+  end
 
-      fiber = Fiber.new do
-        while true; Fiber.yield; end
-      rescue Exception
-        rescue_executed = true
-      end
+  it "does not execute rescue block" do
+    rescue_executed = false
 
-      fiber.resume
-      fiber.kill
-      rescue_executed.should == false
+    fiber = Fiber.new do
+      while true; Fiber.yield; end
+    rescue Exception
+      rescue_executed = true
     end
 
-    it "repeatedly kills a fiber" do
-      fiber = Fiber.new do
-        while true; Fiber.yield; end
-      ensure
-        while true; Fiber.yield; end
-      end
+    fiber.resume
+    fiber.kill
+    rescue_executed.should == false
+  end
 
-      fiber.kill
-      fiber.alive?.should == false
+  it "repeatedly kills a fiber" do
+    fiber = Fiber.new do
+      while true; Fiber.yield; end
+    ensure
+      while true; Fiber.yield; end
     end
+
+    fiber.kill
+    fiber.alive?.should == false
   end
 end
diff --git a/spec/ruby/core/fiber/storage_spec.rb b/spec/ruby/core/fiber/storage_spec.rb
index 015caaf3bb..6ffc13ee28 100644
--- a/spec/ruby/core/fiber/storage_spec.rb
+++ b/spec/ruby/core/fiber/storage_spec.rb
@@ -161,13 +161,11 @@ describe "Fiber.[]=" do
     -> { Fiber[Object.new] = 44 }.should raise_error(TypeError)
   end
 
-  ruby_version_is "3.3" do
-    it "deletes the fiber storage key when assigning nil" do
-      Fiber.new(storage: {life: 42}) {
-        Fiber[:life] = nil
-        Fiber.current.storage
-      }.resume.should == {}
-    end
+  it "deletes the fiber storage key when assigning nil" do
+    Fiber.new(storage: {life: 42}) {
+      Fiber[:life] = nil
+      Fiber.current.storage
+    }.resume.should == {}
   end
 end