archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r30798 from trunk into ruby_1_9_2.

Browse source 
--
* lib/test/unit/assertions.rb (assert_block): move from
  test/fileutils/fileasserts.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-31 02:28:46 +00:00
parent a4dba49575
commit 72b489a5ad
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -472,7 +472,10 @@ Sun May 1 18:35:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/fileutils/fileasserts.rb (assert_block): little workaround * test/fileutils/fileasserts.rb (assert_block): little workaround
for [ruby-dev:43174]. for [ruby-dev:43174].
Sat Feb 5 20:40:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Feb 5 21:22:21 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/assertions.rb (assert_block): move from
test/fileutils/fileasserts.rb.
* test/fileutils/fileasserts.rb (assert_block): pass arguments * test/fileutils/fileasserts.rb (assert_block): pass arguments
as-is. [ruby-dev:43174] as-is. [ruby-dev:43174]

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

@ -19,6 +19,10 @@ module Test
super super
end end
def assert_block(*msgs)
assert yield, *msgs
end
def assert_raise(*args, &b) def assert_raise(*args, &b)
assert_raises(*args, &b) assert_raises(*args, &b)
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 266 #define RUBY_PATCHLEVEL 267
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1