summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 06:18:14 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 06:18:14 +0000
commitaee9d41bbeeefb023fe5463083f322a0f9ce439c (patch)
treec79c0b1ca58a42bfc04c81e822de2cc96b8928cc /test
parent1661faa67b2228b9b93e8a78ead015c9e443b542 (diff)
downloadruby-aee9d41bbeeefb023fe5463083f322a0f9ce439c.tar.gz
ruby-aee9d41bbeeefb023fe5463083f322a0f9ce439c.tar.xz
ruby-aee9d41bbeeefb023fe5463083f322a0f9ce439c.zip
merges r21134 from ruby_1_9_1 into trunk.
* test/rubygems/test_gem_command.rb (test_add_option_overlapping_common_and_local_options): follows r21066. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rubygems/test_gem_command.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 08da9fb7d..ff63804a4 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