ruby-changes:57668
From: Benoit <ko1@a...>
Date: Sun, 8 Sep 2019 19:42:35 +0900 (JST)
Subject: [ruby-changes:57668] b10940a839 (master): Improve Proc#to_s specs
https://git.ruby-lang.org/ruby.git/commit/?id=b10940a839 From b10940a839636cbd990cb2f8a6430fb39c50fb04 Mon Sep 17 00:00:00 2001 From: Benoit Daloze <eregontp@g...> Date: Sun, 8 Sep 2019 12:41:14 +0200 Subject: Improve Proc#to_s specs diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb index 050feb7..8b9c839 100644 --- a/spec/ruby/core/proc/shared/to_s.rb +++ b/spec/ruby/core/proc/shared/to_s.rb @@ -1,7 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/proc/shared/to_s.rb#L1 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 optionally including file and line number" do - Proc.new { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)( ([^ ]*)\/to_s\.rb:4)?>$/ + 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 @@ -10,8 +12,8 @@ describe :proc_to_s, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/proc/shared/to_s.rb#L12 end describe "for a proc created with lambda" do - it "returns a description including '(lambda)' and optionally including file and line number" do - -> { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)( ([^ ]*)\/to_s\.rb:14)? \(lambda\)>$/ + 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 @@ -20,8 +22,8 @@ describe :proc_to_s, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/proc/shared/to_s.rb#L22 end describe "for a proc created with proc" do - it "returns a description optionally including file and line number" do - proc { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)( ([^ ]*)\/to_s\.rb:24)?>$/ + 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 @@ -32,7 +34,7 @@ describe :proc_to_s, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/proc/shared/to_s.rb#L34 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 - method("hello").to_proc.send(@method).should =~ /^#<Proc:([^ ]*?)( ([^ ]*)\/to_s\.rb:22)? \(lambda\)>$/ + method("hello").to_proc.send(@method).should =~ /^#<Proc:([^ ]*?)(#{sep}#{Regexp.escape __FILE__}:#{__LINE__ })? \(lambda\)>$/ end it "has a binary encoding" do -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/