summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 16:22:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 16:22:42 +0000
commit607b1f27870b1a2bf184ff09f8376cc4eb856873 (patch)
tree89d065ab9cfac3d1ca9e4f00c13f937e82027c8b
parent4958c965b7f5c892a9f1a62ab81ef839da843510 (diff)
* lib/mini/test.rb (Mini::Assertions#assert_raise): fixed typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mini/test.rb2
-rw-r--r--lib/test/unit/assertions.rb2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73084fdaed5..f8911e3d175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 25 01:22:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mini/test.rb (Mini::Assertions#assert_raise): fixed typo.
+
Wed Sep 24 23:39:00 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
* test/cgi/test_cgi_multipart.rb : revert last change.
diff --git a/lib/mini/test.rb b/lib/mini/test.rb
index 88cc9deafc0..e8b12179e70 100644
--- a/lib/mini/test.rb
+++ b/lib/mini/test.rb
@@ -129,7 +129,7 @@ module Mini
assert o1.__send__(op, o2), msg
end
- def assert_raises *exp
+ def assert_raise *exp
msg = String === exp.last ? exp.pop : nil
should_raise = false
begin
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 6c29b78096b..c032adafaa9 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -34,7 +34,7 @@ end
module Test::Unit
module Assertions # deprecations
tu_deprecate :assert_nothing_thrown, :assert_nothing_raised # 2009-06-01
- tu_deprecate :assert_raise, :assert_raises # 2010-06-01
+ tu_deprecate :assert_raises, :assert_raise # 2010-06-01
tu_deprecate :assert_not_equal, :refute_equal # 2009-06-01
tu_deprecate :assert_no_match, :refute_match # 2009-06-01
tu_deprecate :assert_not_nil, :refute_nil # 2009-06-01