aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/fileutils/fileasserts.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6393dbab04..fa8cb8cbde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 5 20:40:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/fileutils/fileasserts.rb (assert_block): pass arguments
+ as-is. [ruby-dev:43174]
+
Sat Feb 5 16:47:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb
index 3ecd6a5259..97e7f964de 100644
--- a/test/fileutils/fileasserts.rb
+++ b/test/fileutils/fileasserts.rb
@@ -8,8 +8,8 @@ module Test
yield
end
- def assert_block msg = nil
- assert yield, msg
+ def assert_block(*msgs)
+ assert yield, *msgs
end
def assert_same_file(from, to, message=nil)