Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 141 insertions, 0 deletions

diff --git a/spec/ruby/core/proc/compose_spec.rb b/spec/ruby/core/proc/compose_spec.rb
new file mode 100644
index 0000000000..f1befe658b
--- /dev/null
+++ b/spec/ruby/core/proc/compose_spec.rb
@@ -0,0 +1,94 @@
+require_relative '../../spec_helper'
+require_relative 'shared/compose'
+
+ruby_version_is "2.6" do
+  describe "Proc#<<" do
+    it "returns a Proc that is the composition of self and the passed Proc" do
+      upcase = proc { |s| s.upcase }
+      succ = proc { |s| s.succ }
+
+      (succ << upcase).call('Ruby').should == "RUBZ"
+    end
+
+    it "calls passed Proc with arguments and then calls self with result" do
+      f = proc { |x| x * x }
+      g = proc { |x| x + x }
+
+      (f << g).call(2).should == 16
+      (g << f).call(2).should == 8
+    end
+
+    it "accepts any callable object" do
+      inc = proc { |n| n + 1 }
+
+      double = Object.new
+      def double.call(n); n * 2; end
+
+      (inc << double).call(3).should == 7
+    end
+
+    it_behaves_like :proc_compose, :<<, -> { proc { |s| s.upcase } }
+
+    describe "composition" do
+      it "is a Proc" do
+        f = proc { |x| x * x }
+        g = proc { |x| x + x }
+
+        (f << g).is_a?(Proc).should == true
+        (f << g).lambda?.should == false
+      end
+
+      it "may accept multiple arguments" do
+        inc = proc { |n| n + 1 }
+        mul = proc { |n, m| n * m }
+
+        (inc << mul).call(2, 3).should == 7
+      end
+    end
+  end
+
+  describe "Proc#>>" do
+    it "returns a Proc that is the composition of self and the passed Proc" do
+      upcase = proc { |s| s.upcase }
+      succ = proc { |s| s.succ }
+
+      (succ >> upcase).call('Ruby').should == "RUBZ"
+    end
+
+    it "calls passed Proc with arguments and then calls self with result" do
+      f = proc { |x| x * x }
+      g = proc { |x| x + x }
+
+      (f >> g).call(2).should == 8
+      (g >> f).call(2).should == 16
+    end
+
+    it "accepts any callable object" do
+      inc = proc { |n| n + 1 }
+
+      double = Object.new
+      def double.call(n); n * 2; end
+
+      (inc >> double).call(3).should == 8
+    end
+
+    it_behaves_like :proc_compose, :>>, -> { proc { |s| s.upcase } }
+
+    describe "composition" do
+      it "is a Proc" do
+        f = proc { |x| x * x }
+        g = proc { |x| x + x }
+
+        (f >> g).is_a?(Proc).should == true
+        (f >> g).lambda?.should == false
+      end
+
+      it "may accept multiple arguments" do
+        inc = proc { |n| n + 1 }
+        mul = proc { |n, m| n * m }
+
+        (mul >> inc).call(2, 3).should == 7
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/proc/shared/compose.rb b/spec/ruby/core/proc/shared/compose.rb
new file mode 100644
index 0000000000..64338cada8
--- /dev/null
+++ b/spec/ruby/core/proc/shared/compose.rb
@@ -0,0 +1,47 @@
+describe :proc_compose, shared: true do
+  ruby_version_is "2.6"..."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)
+
+      -> {
+        composed.call('a')
+      }.should raise_error(NoMethodError, /undefined method `call' for/)
+
+    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
+
+      succ = Object.new
+      def succ.to_proc(s); s.succ; end
+
+      -> {
+        lhs.send(@method, succ)
+      }.should raise_error(TypeError, "callable object is expected")
+    end
+  end
+end