kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

assertions.rb: allow proc

Browse source 
* lib/test/unit/assertions.rb (Test::Unit::Assertions#message):
  convert msg by call if it is a proc, as well as assert.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-08 07:02:37 +00:00
parent 4a3970c211
commit 3d88196632
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/test/unit/assertions.rb
View file

@ -319,6 +319,14 @@ EOT
template &&= template.chomp template &&= template.chomp
template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) } template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
end end
def message(msg = nil, *args, &default)
if Proc === msg
super(nil, *args) {"#{msg.call}#{default.call if default}"}
else
super
end
end
end end
end end
end end

9
test/mkmf/base.rb
View file

@ -10,9 +10,6 @@ $extout_prefix = "$(extout)$(target_prefix)/"
class TestMkmf < Test::Unit::TestCase class TestMkmf < Test::Unit::TestCase
MKMFLOG = proc {File.read("mkmf.log") rescue ""} MKMFLOG = proc {File.read("mkmf.log") rescue ""}
class << MKMFLOG
alias to_s call
end
class Capture class Capture
attr_accessor :origin attr_accessor :origin
@ -54,11 +51,7 @@ class TestMkmf < Test::Unit::TestCase
attr_reader :stdout attr_reader :stdout
def mkmflog(msg) def mkmflog(msg)
log = proc {MKMFLOG[] << msg} proc {MKMFLOG[] << msg}
class << log
alias to_s call
end
log
end end
def setup def setup