Update to ruby/spec@d8bacef

author: Andrew Konchin <[email protected]> 2025-05-07 13:08:11 +0300
committer: Benoit Daloze <[email protected]> 2025-05-09 23:22:15 +0200
commit: 269ad29de95e41cc8a4eede84b98a81a6ff4f7b6 (patch)
tree: 150acf5f6d6c2d401dd46b84b942af26b3699cc9 /spec/ruby/core/exception
parent: 3135eddb4e8c6975b6fa5345f15fdaa55257851a (diff)
3 files changed, 85 insertions, 91 deletions
diff --git a/spec/ruby/core/exception/detailed_message_spec.rb b/spec/ruby/core/exception/detailed_message_spec.rb
index 8178278b2b..9df164a1cf 100644
--- a/spec/ruby/core/exception/detailed_message_spec.rb
+++ b/spec/ruby/core/exception/detailed_message_spec.rb
@@ -2,51 +2,49 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/common'
 
 describe "Exception#detailed_message" do
-  ruby_version_is "3.2" do
-    it "returns decorated message" do
-      RuntimeError.new("new error").detailed_message.should == "new error (RuntimeError)"
-    end
+  it "returns decorated message" do
+    RuntimeError.new("new error").detailed_message.should == "new error (RuntimeError)"
+  end
 
-    it "is called by #full_message to allow message customization" do
-      exception = Exception.new("new error")
-      def exception.detailed_message(**)
-        "<prefix>#{message}<suffix>"
-      end
-      exception.full_message(highlight: false).should.include? "<prefix>new error<suffix>"
+  it "is called by #full_message to allow message customization" do
+    exception = Exception.new("new error")
+    def exception.detailed_message(**)
+      "<prefix>#{message}<suffix>"
     end
+    exception.full_message(highlight: false).should.include? "<prefix>new error<suffix>"
+  end
 
-    it "returns just a message if exception class is anonymous" do
-      Class.new(RuntimeError).new("message").detailed_message.should == "message"
-    end
+  it "returns just a message if exception class is anonymous" do
+    Class.new(RuntimeError).new("message").detailed_message.should == "message"
+  end
 
-    it "returns 'unhandled exception' for an instance of RuntimeError with empty message" do
-      RuntimeError.new("").detailed_message.should == "unhandled exception"
-    end
+  it "returns 'unhandled exception' for an instance of RuntimeError with empty message" do
+    RuntimeError.new("").detailed_message.should == "unhandled exception"
+  end
 
-    it "returns just class name for an instance other than RuntimeError with empty message" do
-      DetailedMessageSpec::C.new("").detailed_message.should == "DetailedMessageSpec::C"
-      StandardError.new("").detailed_message.should == "StandardError"
-    end
+  it "returns just class name for an instance other than RuntimeError with empty message" do
+    DetailedMessageSpec::C.new("").detailed_message.should == "DetailedMessageSpec::C"
+    StandardError.new("").detailed_message.should == "StandardError"
+  end
 
-    it "returns a generated class name for an instance of RuntimeError anonymous subclass with empty message" do
-      klass = Class.new(RuntimeError)
-      klass.new("").detailed_message.should =~ /\A#<Class:0x\h+>\z/
-    end
+  it "returns a generated class name for an instance of RuntimeError anonymous subclass with empty message" do
+    klass = Class.new(RuntimeError)
+    klass.new("").detailed_message.should =~ /\A#<Class:0x\h+>\z/
+  end
 
-    it "accepts highlight keyword argument and adds escape control sequences" do
-      RuntimeError.new("new error").detailed_message(highlight: true).should == "\e[1mnew error (\e[1;4mRuntimeError\e[m\e[1m)\e[m"
-    end
+  it "accepts highlight keyword argument and adds escape control sequences" do
+    RuntimeError.new("new error").detailed_message(highlight: true).should == "\e[1mnew error (\e[1;4mRuntimeError\e[m\e[1m)\e[m"
+  end
 
-    it "accepts highlight keyword argument and adds escape control sequences for an instance of RuntimeError with empty message" do
-      RuntimeError.new("").detailed_message(highlight: true).should == "\e[1;4munhandled exception\e[m"
-    end
+  it "accepts highlight keyword argument and adds escape control sequences for an instance of RuntimeError with empty message" do
+    RuntimeError.new("").detailed_message(highlight: true).should == "\e[1;4munhandled exception\e[m"
+  end
 
-    it "accepts highlight keyword argument and adds escape control sequences for an instance other than RuntimeError with empty message" do
-      StandardError.new("").detailed_message(highlight: true).should == "\e[1;4mStandardError\e[m"
-    end
+  it "accepts highlight keyword argument and adds escape control sequences for an instance other than RuntimeError with empty message" do
+    StandardError.new("").detailed_message(highlight: true).should == "\e[1;4mStandardError\e[m"
+  end
 
-    it "allows and ignores other keyword arguments" do
-      RuntimeError.new("new error").detailed_message(foo: true).should == "new error (RuntimeError)"
-    end
+  it "allows and ignores other keyword arguments" do
+    RuntimeError.new("new error").detailed_message(foo: true).should == "new error (RuntimeError)"
   end
 end
diff --git a/spec/ruby/core/exception/full_message_spec.rb b/spec/ruby/core/exception/full_message_spec.rb
index d752083db2..b07c6d4829 100644
--- a/spec/ruby/core/exception/full_message_spec.rb
+++ b/spec/ruby/core/exception/full_message_spec.rb
@@ -165,52 +165,50 @@ describe "Exception#full_message" do
     exception.full_message.should include "origin exception"
   end
 
-  ruby_version_is "3.2" do
-    it "relies on #detailed_message" do
-      e = RuntimeError.new("new error")
-      e.define_singleton_method(:detailed_message) { |**| "DETAILED MESSAGE" }
+  it "relies on #detailed_message" do
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| "DETAILED MESSAGE" }
 
-      e.full_message.lines.first.should =~ /DETAILED MESSAGE/
-    end
-
-    it "passes all its own keyword arguments (with :highlight default value and without :order default value) to #detailed_message" do
-      e = RuntimeError.new("new error")
-      options_passed = nil
-      e.define_singleton_method(:detailed_message) do |**options|
-        options_passed = options
-        "DETAILED MESSAGE"
-      end
+    e.full_message.lines.first.should =~ /DETAILED MESSAGE/
+  end
 
-      e.full_message(foo: "bar")
-      options_passed.should == { foo: "bar", highlight: Exception.to_tty? }
+  it "passes all its own keyword arguments (with :highlight default value and without :order default value) to #detailed_message" do
+    e = RuntimeError.new("new error")
+    options_passed = nil
+    e.define_singleton_method(:detailed_message) do |**options|
+      options_passed = options
+      "DETAILED MESSAGE"
     end
 
-    it "converts #detailed_message returned value to String if it isn't a String" do
-      message = Object.new
-      def message.to_str; "DETAILED MESSAGE"; end
+    e.full_message(foo: "bar")
+    options_passed.should == { foo: "bar", highlight: Exception.to_tty? }
+  end
 
-      e = RuntimeError.new("new error")
-      e.define_singleton_method(:detailed_message) { |**| message }
+  it "converts #detailed_message returned value to String if it isn't a String" do
+    message = Object.new
+    def message.to_str; "DETAILED MESSAGE"; end
 
-      e.full_message.lines.first.should =~ /DETAILED MESSAGE/
-    end
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| message }
 
-    it "uses class name if #detailed_message returns nil" do
-      e = RuntimeError.new("new error")
-      e.define_singleton_method(:detailed_message) { |**| nil }
+    e.full_message.lines.first.should =~ /DETAILED MESSAGE/
+  end
 
-      e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
-      e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
-    end
+  it "uses class name if #detailed_message returns nil" do
+    e = RuntimeError.new("new error")
+    e.define_singleton_method(:detailed_message) { |**| nil }
 
-    it "uses class name if exception object doesn't respond to #detailed_message" do
-      e = RuntimeError.new("new error")
-      class << e
-        undef :detailed_message
-      end
+    e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
+    e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
+  end
 
-      e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
-      e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
+  it "uses class name if exception object doesn't respond to #detailed_message" do
+    e = RuntimeError.new("new error")
+    class << e
+      undef :detailed_message
     end
+
+    e.full_message(highlight: false).lines.first.should =~ /RuntimeError/
+    e.full_message(highlight: true).lines.first.should =~ /#{Regexp.escape("\e[1;4mRuntimeError\e[m")}/
   end
 end
diff --git a/spec/ruby/core/exception/syntax_error_spec.rb b/spec/ruby/core/exception/syntax_error_spec.rb
index 6cc8522de3..4c713a3507 100644
--- a/spec/ruby/core/exception/syntax_error_spec.rb
+++ b/spec/ruby/core/exception/syntax_error_spec.rb
@@ -1,27 +1,25 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.2" do
-  describe "SyntaxError#path" do
-    it "returns the file path provided to eval" do
-      filename = "speccing.rb"
+describe "SyntaxError#path" do
+  it "returns the file path provided to eval" do
+    filename = "speccing.rb"
 
-      -> {
-        eval("if true", TOPLEVEL_BINDING, filename)
-      }.should raise_error(SyntaxError) { |e|
-        e.path.should == filename
-      }
-    end
+    -> {
+      eval("if true", TOPLEVEL_BINDING, filename)
+    }.should raise_error(SyntaxError) { |e|
+      e.path.should == filename
+    }
+  end
 
-    it "returns the file path that raised an exception" do
-      expected_path = fixture(__FILE__, "syntax_error.rb")
+  it "returns the file path that raised an exception" do
+    expected_path = fixture(__FILE__, "syntax_error.rb")
 
-      -> {
-        require_relative "fixtures/syntax_error"
-      }.should raise_error(SyntaxError) { |e| e.path.should == expected_path }
-    end
+    -> {
+      require_relative "fixtures/syntax_error"
+    }.should raise_error(SyntaxError) { |e| e.path.should == expected_path }
+  end
 
-    it "returns nil when constructed directly" do
-      SyntaxError.new.path.should == nil
-    end
+  it "returns nil when constructed directly" do
+    SyntaxError.new.path.should == nil
   end
 end
author	Andrew Konchin <[email protected]>	2025-05-07 13:08:11 +0300
committer	Benoit Daloze <[email protected]>	2025-05-09 23:22:15 +0200
commit	269ad29de95e41cc8a4eede84b98a81a6ff4f7b6 (patch)
tree	150acf5f6d6c2d401dd46b84b942af26b3699cc9 /spec/ruby/core/exception
parent	3135eddb4e8c6975b6fa5345f15fdaa55257851a (diff)