summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:43:21 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:43:21 +0000
commitf9deedb3cca2db8df679ab0d688d5045c8fb9c3a (patch)
tree8e2ae1ee8883963762d0d4e85bdda7357e3669b7
parent3dd5483f905d7e3b5619a619abe6fb7102f26626 (diff)
* test/rubygems/test_gem_command.rb
(test_add_option_overlapping_common_and_local_options): follows r21066. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/rubygems/test_gem_command.rb6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ba5ecfb6a..075091d83b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 28 18:36:33 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/rubygems/test_gem_command.rb
+ (test_add_option_overlapping_common_and_local_options):
+ follows r21066.
+
Sun Dec 28 17:21:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
* test/rubygems/test_ext_configure_builder.rb (test_self_build_fail):
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 08da9fb7d6..ff63804a4a 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -60,9 +60,9 @@ class TestGemCommand < RubyGemTestCase
@cmd.add_option('-z', '--exe', 'BAD!') do end
@cmd.add_option('-x', '--exe', 'BAD!') do end
- assert_match %r|-x, --zip|, @cmd.parser.to_s
- assert_match %r|-z, --exe|, @cmd.parser.to_s
- refute_match %r|-x, --exe|, @cmd.parser.to_s
+ assert_match %r|-x, --exe|, @cmd.parser.to_s
+ refute_match %r|-z, --exe|, @cmd.parser.to_s
+ refute_match %r|-x, --zip|, @cmd.parser.to_s
end
def test_basic_accessors