Update to ruby/spec@3affe1e

1 files changed, 73 insertions, 75 deletions

diff --git a/spec/ruby/core/fiber/raise_spec.rb b/spec/ruby/core/fiber/raise_spec.rb
index 2a465c8bfa..09c4c1b524 100644
--- a/spec/ruby/core/fiber/raise_spec.rb
+++ b/spec/ruby/core/fiber/raise_spec.rb
@@ -2,101 +2,99 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative '../../shared/kernel/raise'
 
-ruby_version_is "2.7" do
-  describe "Fiber#raise" do
-    it_behaves_like :kernel_raise, :raise, FiberSpecs::NewFiberToRaise
+describe "Fiber#raise" do
+  it_behaves_like :kernel_raise, :raise, FiberSpecs::NewFiberToRaise
+end
+
+describe "Fiber#raise" do
+  it 'raises RuntimeError by default' do
+    -> { FiberSpecs::NewFiberToRaise.raise }.should raise_error(RuntimeError)
   end
 
-  describe "Fiber#raise" do
-    it 'raises RuntimeError by default' do
-      -> { FiberSpecs::NewFiberToRaise.raise }.should raise_error(RuntimeError)
-    end
+  it "raises FiberError if Fiber is not born" do
+    fiber = Fiber.new { true }
+    -> { fiber.raise }.should raise_error(FiberError, "cannot raise exception on unborn fiber")
+  end
 
-    it "raises FiberError if Fiber is not born" do
-      fiber = Fiber.new { true }
-      -> { fiber.raise }.should raise_error(FiberError, "cannot raise exception on unborn fiber")
-    end
+  it "raises FiberError if Fiber is dead" do
+    fiber = Fiber.new { true }
+    fiber.resume
+    -> { fiber.raise }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
+  end
 
-    it "raises FiberError if Fiber is dead" do
-      fiber = Fiber.new { true }
-      fiber.resume
-      -> { fiber.raise }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
-    end
+  it 'accepts error class' do
+    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError }.should raise_error(FiberSpecs::CustomError)
+  end
 
-    it 'accepts error class' do
-      -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError }.should raise_error(FiberSpecs::CustomError)
-    end
+  it 'accepts error message' do
+    -> { FiberSpecs::NewFiberToRaise.raise "error message" }.should raise_error(RuntimeError, "error message")
+  end
 
-    it 'accepts error message' do
-      -> { FiberSpecs::NewFiberToRaise.raise "error message" }.should raise_error(RuntimeError, "error message")
-    end
+  it 'does not accept array of backtrace information only' do
+    -> { FiberSpecs::NewFiberToRaise.raise ['foo'] }.should raise_error(TypeError)
+  end
 
-    it 'does not accept array of backtrace information only' do
-      -> { FiberSpecs::NewFiberToRaise.raise ['foo'] }.should raise_error(TypeError)
-    end
+  it 'does not accept integer' do
+    -> { FiberSpecs::NewFiberToRaise.raise 100 }.should raise_error(TypeError)
+  end
 
-    it 'does not accept integer' do
-      -> { FiberSpecs::NewFiberToRaise.raise 100 }.should raise_error(TypeError)
-    end
+  it 'accepts error class with error message' do
+    -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error' }.should raise_error(FiberSpecs::CustomError, 'test error')
+  end
 
-    it 'accepts error class with error message' do
-      -> { FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error' }.should raise_error(FiberSpecs::CustomError, 'test error')
-    end
+  it 'accepts error class with with error message and backtrace information' do
+    -> {
+      FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error', ['foo', 'boo']
+    }.should raise_error(FiberSpecs::CustomError) { |e|
+      e.message.should == 'test error'
+      e.backtrace.should == ['foo', 'boo']
+    }
+  end
 
-    it 'accepts error class with with error message and backtrace information' do
-      -> {
-        FiberSpecs::NewFiberToRaise.raise FiberSpecs::CustomError, 'test error', ['foo', 'boo']
-      }.should raise_error(FiberSpecs::CustomError) { |e|
-        e.message.should == 'test error'
-        e.backtrace.should == ['foo', 'boo']
-      }
-    end
+  it 'does not accept only error message and backtrace information' do
+    -> { FiberSpecs::NewFiberToRaise.raise 'test error', ['foo', 'boo'] }.should raise_error(TypeError)
+  end
 
-    it 'does not accept only error message and backtrace information' do
-      -> { FiberSpecs::NewFiberToRaise.raise 'test error', ['foo', 'boo'] }.should raise_error(TypeError)
-    end
+  it "raises a FiberError if invoked from a different Thread" do
+    fiber = Fiber.new { Fiber.yield }
+    fiber.resume
+    Thread.new do
+      -> {
+        fiber.raise
+      }.should raise_error(FiberError, "fiber called across threads")
+    end.join
+  end
 
-    it "raises a FiberError if invoked from a different Thread" do
-      fiber = Fiber.new { Fiber.yield }
-      fiber.resume
-      Thread.new do
-        -> {
-          fiber.raise
-        }.should raise_error(FiberError, "fiber called across threads")
-      end.join
-    end
+  it "kills Fiber" do
+    fiber = Fiber.new { Fiber.yield :first; :second }
+    fiber.resume
+    -> { fiber.raise }.should raise_error
+    -> { fiber.resume }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
+  end
 
-    it "kills Fiber" do
-      fiber = Fiber.new { Fiber.yield :first; :second }
-      fiber.resume
-      -> { fiber.raise }.should raise_error
-      -> { fiber.resume }.should raise_error(FiberError, /dead fiber called|attempt to resume a terminated fiber/)
+  it "returns to calling fiber after raise" do
+    fiber_one = Fiber.new do
+      Fiber.yield :yield_one
+      :unreachable
     end
 
-    it "returns to calling fiber after raise" do
-      fiber_one = Fiber.new do
-        Fiber.yield :yield_one
-        :unreachable
-      end
-
-      fiber_two = Fiber.new do
-        results = []
-        results << fiber_one.resume
-        begin
-          fiber_one.raise
-        rescue
-          results << :rescued
-        end
-        results
+    fiber_two = Fiber.new do
+      results = []
+      results << fiber_one.resume
+      begin
+        fiber_one.raise
+      rescue
+        results << :rescued
       end
-
-      fiber_two.resume.should == [:yield_one, :rescued]
+      results
     end
-  end
 
+    fiber_two.resume.should == [:yield_one, :rescued]
+  end
 end
 
-ruby_version_is "2.7"..."3.0" do
+
+ruby_version_is ""..."3.0" do
   describe "Fiber#raise" do
     it "raises a FiberError if invoked on a transferring Fiber" do
       require "fiber"