summaryrefslogtreecommitdiff
path: root/spec/ruby/core/proc/shared
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/core/proc/shared')
-rw-r--r--spec/ruby/core/proc/shared/call.rb96
-rw-r--r--spec/ruby/core/proc/shared/call_arguments.rb29
-rw-r--r--spec/ruby/core/proc/shared/compose.rb51
-rw-r--r--spec/ruby/core/proc/shared/dup.rb31
-rw-r--r--spec/ruby/core/proc/shared/equal.rb100
-rw-r--r--spec/ruby/core/proc/shared/to_s.rb62
6 files changed, 43 insertions, 326 deletions
diff --git a/spec/ruby/core/proc/shared/call.rb b/spec/ruby/core/proc/shared/call.rb
deleted file mode 100644
index c30ea84b23..0000000000
--- a/spec/ruby/core/proc/shared/call.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require_relative '../fixtures/common'
-
-describe :proc_call, shared: true do
- it "invokes self" do
- Proc.new { "test!" }.send(@method).should == "test!"
- -> { "test!" }.send(@method).should == "test!"
- proc { "test!" }.send(@method).should == "test!"
- end
-
- it "sets self's parameters to the given values" do
- Proc.new { |a, b| a + b }.send(@method, 1, 2).should == 3
- Proc.new { |*args| args }.send(@method, 1, 2, 3, 4).should == [1, 2, 3, 4]
- Proc.new { |_, *args| args }.send(@method, 1, 2, 3).should == [2, 3]
-
- -> a, b { a + b }.send(@method, 1, 2).should == 3
- -> *args { args }.send(@method, 1, 2, 3, 4).should == [1, 2, 3, 4]
- -> _, *args { args }.send(@method, 1, 2, 3).should == [2, 3]
-
- proc { |a, b| a + b }.send(@method, 1, 2).should == 3
- proc { |*args| args }.send(@method, 1, 2, 3, 4).should == [1, 2, 3, 4]
- proc { |_, *args| args }.send(@method, 1, 2, 3).should == [2, 3]
- end
-end
-
-
-describe :proc_call_on_proc_new, shared: true do
- it "replaces missing arguments with nil" do
- Proc.new { |a, b| [a, b] }.send(@method).should == [nil, nil]
- Proc.new { |a, b| [a, b] }.send(@method, 1).should == [1, nil]
- end
-
- it "silently ignores extra arguments" do
- Proc.new { |a, b| a + b }.send(@method, 1, 2, 5).should == 3
- end
-
- it "auto-explodes a single Array argument" do
- p = Proc.new { |a, b| [a, b] }
- p.send(@method, 1, 2).should == [1, 2]
- p.send(@method, [1, 2]).should == [1, 2]
- p.send(@method, [1, 2, 3]).should == [1, 2]
- p.send(@method, [1, 2, 3], 4).should == [[1, 2, 3], 4]
- end
-end
-
-describe :proc_call_on_proc_or_lambda, shared: true do
- it "ignores excess arguments when self is a proc" do
- a = proc {|x| x}.send(@method, 1, 2)
- a.should == 1
-
- a = proc {|x| x}.send(@method, 1, 2, 3)
- a.should == 1
- end
-
- it "will call #to_ary on argument and return self if return is nil" do
- argument = ProcSpecs::ToAryAsNil.new
- result = proc { |x, _| x }.send(@method, argument)
- result.should == argument
- end
-
- it "substitutes nil for missing arguments when self is a proc" do
- proc {|x,y| [x,y]}.send(@method).should == [nil,nil]
-
- a = proc {|x,y| [x, y]}.send(@method, 1)
- a.should == [1,nil]
- end
-
- it "raises an ArgumentError on excess arguments when self is a lambda" do
- -> {
- -> x { x }.send(@method, 1, 2)
- }.should raise_error(ArgumentError)
-
- -> {
- -> x { x }.send(@method, 1, 2, 3)
- }.should raise_error(ArgumentError)
- end
-
- it "raises an ArgumentError on missing arguments when self is a lambda" do
- -> {
- -> x { x }.send(@method)
- }.should raise_error(ArgumentError)
-
- -> {
- -> x, y { [x,y] }.send(@method, 1)
- }.should raise_error(ArgumentError)
- end
-
- it "treats a single Array argument as a single argument when self is a lambda" do
- -> a { a }.send(@method, [1, 2]).should == [1, 2]
- -> a, b { [a, b] }.send(@method, [1, 2], 3).should == [[1,2], 3]
- end
-
- it "treats a single Array argument as a single argument when self is a proc" do
- proc { |a| a }.send(@method, [1, 2]).should == [1, 2]
- proc { |a, b| [a, b] }.send(@method, [1, 2], 3).should == [[1,2], 3]
- end
-end
diff --git a/spec/ruby/core/proc/shared/call_arguments.rb b/spec/ruby/core/proc/shared/call_arguments.rb
deleted file mode 100644
index 91ada3439e..0000000000
--- a/spec/ruby/core/proc/shared/call_arguments.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-describe :proc_call_block_args, shared: true do
- it "can receive block arguments" do
- Proc.new {|&b| b.send(@method)}.send(@method) {1 + 1}.should == 2
- -> &b { b.send(@method)}.send(@method) {1 + 1}.should == 2
- proc {|&b| b.send(@method)}.send(@method) {1 + 1}.should == 2
- end
-
- it "yields to the block given at declaration and not to the block argument" do
- proc_creator = Object.new
- def proc_creator.create
- Proc.new do |&b|
- yield
- end
- end
- a_proc = proc_creator.create { 7 }
- a_proc.send(@method) { 3 }.should == 7
- end
-
- it "can call its block argument declared with a block argument" do
- proc_creator = Object.new
- def proc_creator.create(method_name)
- Proc.new do |&b|
- yield + b.send(method_name)
- end
- end
- a_proc = proc_creator.create(@method) { 7 }
- a_proc.call { 3 }.should == 10
- end
-end
diff --git a/spec/ruby/core/proc/shared/compose.rb b/spec/ruby/core/proc/shared/compose.rb
index 64338cada8..c004cec7c9 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.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)
+ 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(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(TypeError, "callable object is expected")
end
end
diff --git a/spec/ruby/core/proc/shared/dup.rb b/spec/ruby/core/proc/shared/dup.rb
index eda1d6929d..2821d2e00f 100644
--- a/spec/ruby/core/proc/shared/dup.rb
+++ b/spec/ruby/core/proc/shared/dup.rb
@@ -3,8 +3,37 @@ describe :proc_dup, shared: true do
a = -> { "hello" }
b = a.send(@method)
- a.should_not equal(b)
+ a.should_not.equal?(b)
a.call.should == b.call
end
+
+ it "returns an instance of subclass" do
+ cl = Class.new(Proc)
+
+ cl.new{}.send(@method).class.should == cl
+ end
+
+ ruby_version_is "3.4" do
+ it "copies instance variables" do
+ proc = -> { "hello" }
+ proc.instance_variable_set(:@ivar, 1)
+ cl = proc.send(@method)
+ cl.instance_variables.should == [:@ivar]
+ end
+
+ it "copies the finalizer" do
+ code = <<-'RUBY'
+ obj = Proc.new { }
+
+ ObjectSpace.define_finalizer(obj, Proc.new { STDOUT.write "finalized\n" })
+
+ obj.clone
+
+ exit 0
+ RUBY
+
+ ruby_exe(code).lines.sort.should == ["finalized\n", "finalized\n"]
+ end
+ end
end
diff --git a/spec/ruby/core/proc/shared/equal.rb b/spec/ruby/core/proc/shared/equal.rb
deleted file mode 100644
index 0c0020ca7f..0000000000
--- a/spec/ruby/core/proc/shared/equal.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require_relative '../../../spec_helper'
-require_relative '../fixtures/common'
-
-describe :proc_equal, shared: true do
- it "is a public method" do
- Proc.should have_public_instance_method(@method, false)
- end
-
- it "returns true if self and other are the same object" do
- p = proc { :foo }
- p.send(@method, p).should be_true
-
- p = Proc.new { :foo }
- p.send(@method, p).should be_true
-
- p = -> { :foo }
- p.send(@method, p).should be_true
- end
-
- it "returns true if other is a dup of the original" do
- p = proc { :foo }
- p.send(@method, p.dup).should be_true
-
- p = Proc.new { :foo }
- p.send(@method, p.dup).should be_true
-
- p = -> { :foo }
- p.send(@method, p.dup).should be_true
- end
-
- # identical here means the same method invocation.
- it "returns false when bodies are the same but capture env is not identical" do
- a = ProcSpecs.proc_for_1
- b = ProcSpecs.proc_for_1
-
- a.send(@method, b).should be_false
- end
-
- it "returns false if procs are distinct but have the same body and environment" do
- p = proc { :foo }
- p2 = proc { :foo }
- p.send(@method, p2).should be_false
- end
-
- it "returns false if lambdas are distinct but have same body and environment" do
- x = -> { :foo }
- x2 = -> { :foo }
- x.send(@method, x2).should be_false
- end
-
- it "returns false if using comparing lambda to proc, even with the same body and env" do
- p = -> { :foo }
- p2 = proc { :foo }
- p.send(@method, p2).should be_false
-
- x = proc { :bar }
- x2 = -> { :bar }
- x.send(@method, x2).should be_false
- end
-
- it "returns false if other is not a Proc" do
- p = proc { :foo }
- p.send(@method, []).should be_false
-
- p = Proc.new { :foo }
- p.send(@method, Object.new).should be_false
-
- p = -> { :foo }
- p.send(@method, :foo).should be_false
- end
-
- it "returns false if self and other are both procs but have different bodies" do
- p = proc { :bar }
- p2 = proc { :foo }
- p.send(@method, p2).should be_false
- end
-
- it "returns false if self and other are both lambdas but have different bodies" do
- p = -> { :foo }
- p2 = -> { :bar }
- p.send(@method, p2).should be_false
- end
-end
-
-describe :proc_equal_undefined, shared: true do
- it "is not defined" do
- Proc.should_not have_instance_method(@method, false)
- end
-
- it "returns false if other is a dup of the original" do
- p = proc { :foo }
- p.send(@method, p.dup).should be_false
-
- p = Proc.new { :foo }
- p.send(@method, p.dup).should be_false
-
- p = -> { :foo }
- p.send(@method, p.dup).should be_false
- end
-end
diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb
deleted file mode 100644
index 7f167a3d9d..0000000000
--- a/spec/ruby/core/proc/shared/to_s.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-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__ }>$/
- end
-
- it "has a binary encoding" do
- Proc.new { "hello" }.send(@method).encoding.should == Encoding::BINARY
- end
- end
-
- 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\)>$/
- end
-
- it "has a binary encoding" do
- -> { "hello" }.send(@method).encoding.should == Encoding::BINARY
- end
- end
-
- 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__ }>$/
- end
-
- it "has a binary encoding" do
- proc { "hello" }.send(@method).encoding.should == Encoding::BINARY
- end
- end
-
- describe "for a proc created with UnboundMethod#to_proc" do
- it "returns a description including '(lambda)' and optionally including file and line number" 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\)>$/
- else
- s.should =~ /^#<Proc:([^ ]*?) \(lambda\)>$/
- end
- end
-
- it "has a binary encoding" do
- def hello; end
- method("hello").to_proc.send(@method).encoding.should == Encoding::BINARY
- end
- end
-
- describe "for a proc created with Symbol#to_proc" do
- it "returns a description including '(&:symbol)'" do
- proc = :foobar.to_proc
- proc.send(@method).should.include?('(&:foobar)')
- end
-
- it "has a binary encoding" do
- proc = :foobar.to_proc
- proc.send(@method).encoding.should == Encoding::BINARY
- end
- end
-end
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 14:48:02 +0000