summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-29 14:48:17 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-29 14:48:17 +0000
commit21d1a3207a8f54f94ff38d338a06d51e1e4a99cf (patch)
tree7aa2d6e546d85b801af84a9f43a63cdd2b677592
parenta90b1b574c2506a58ca5dacabcdaaa676b99a5c8 (diff)
merges r28387 from trunk into ruby_1_9_2.
-- * test/optparse/test_summary.rb: fixed superclass so that it run solely. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/optparse/test_summary.rb6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 58972d513c..2aa6810a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 22 21:33:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/optparse/test_summary.rb: fixed superclass so that it run
+ solely.
+
Sat Jun 19 03:35:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 12744a8a7b..0c67d7f0f9 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -1,8 +1,6 @@
-require 'test/unit'
-require 'optparse'
+require_relative 'test_optparse'
-class TestOptionParser < Test::Unit::TestCase; end
-class TestOptionParser::SummaryTest < Test::Unit::TestCase
+class TestOptionParser::SummaryTest < TestOptionParser
def test_short_clash
r = nil
o = OptionParser.new do |opts|