Update to ruby/spec@3affe1e

2 files changed, 17 insertions, 44 deletions

diff --git a/spec/ruby/core/proc/shared/compose.rb b/spec/ruby/core/proc/shared/compose.rb
index e3ae7f76b8..3d3f3b310d 100644
--- a/spec/ruby/core/proc/shared/compose.rb
+++ b/spec/ruby/core/proc/shared/compose.rb
@@ -1,47 +1,22 @@
 describe :proc_compose, shared: true do
-  ruby_version_is ""..."2.7" do
-    it "raises NoMethodError when called if passed not callable object" do
-      not_callable = Object.new
-      composed = @object.call.send(@method, not_callable)
+  it "raises TypeError if passed not callable object" do
+    lhs = @object.call
+    not_callable = Object.new
 
-      -> {
-        composed.call('a')
-      }.should raise_error(NoMethodError, /undefined method `call' for/)
+    -> {
+      lhs.send(@method, not_callable)
+    }.should raise_error(TypeError, "callable object is expected")
 
-    end
-
-    it "when called does not try to coerce argument with #to_proc" do
-      succ = Object.new
-      def succ.to_proc(s); s.succ; end
-
-      composed = @object.call.send(@method, succ)
-
-      -> {
-        composed.call('a')
-      }.should raise_error(NoMethodError, /undefined method `call' for/)
-    end
   end
 
-  ruby_version_is "2.7" do # https://bugs.ruby-lang.org/issues/15428
-    it "raises TypeError if passed not callable object" do
-      lhs = @object.call
-      not_callable = Object.new
-
-      -> {
-        lhs.send(@method, not_callable)
-      }.should raise_error(TypeError, "callable object is expected")
-
-    end
-
-    it "does not try to coerce argument with #to_proc" do
-      lhs = @object.call
+  it "does not try to coerce argument with #to_proc" do
+    lhs = @object.call
 
-      succ = Object.new
-      def succ.to_proc(s); s.succ; end
+    succ = Object.new
+    def succ.to_proc(s); s.succ; end
 
-      -> {
-        lhs.send(@method, succ)
-      }.should raise_error(TypeError, "callable object is expected")
-    end
+    -> {
+      lhs.send(@method, succ)
+    }.should raise_error(TypeError, "callable object is expected")
   end
 end
diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb
index 7f167a3d9d..f1e2f416fc 100644
--- a/spec/ruby/core/proc/shared/to_s.rb
+++ b/spec/ruby/core/proc/shared/to_s.rb
@@ -1,9 +1,7 @@
 describe :proc_to_s, shared: true do
-  sep = ruby_version_is("2.7") ? " " : "@"
-
   describe "for a proc created with Proc.new" do
     it "returns a description including file and line number" do
-      Proc.new { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ }>$/
+      Proc.new { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ }>$/
     end
 
     it "has a binary encoding" do
@@ -13,7 +11,7 @@ describe :proc_to_s, shared: true do
 
   describe "for a proc created with lambda" do
     it "returns a description including '(lambda)' and including file and line number" do
-      -> { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ } \(lambda\)>$/
+      -> { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ } \(lambda\)>$/
     end
 
     it "has a binary encoding" do
@@ -23,7 +21,7 @@ describe :proc_to_s, shared: true do
 
   describe "for a proc created with proc" do
     it "returns a description including file and line number" do
-      proc { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ }>$/
+      proc { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ }>$/
     end
 
     it "has a binary encoding" do
@@ -36,7 +34,7 @@ describe :proc_to_s, shared: true do
         def hello; end
         s = method("hello").to_proc.send(@method)
         if s.include? __FILE__
-          s.should =~ /^#<Proc:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ - 3} \(lambda\)>$/
+          s.should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ - 3} \(lambda\)>$/
         else
           s.should =~ /^#<Proc:([^ ]*?) \(lambda\)>$/
         end