summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/rubygems/test_gem_spec_fetcher.rb3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2b7a6de2b..44eec7aa32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 8 15:57:20 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/rubygems/test_gem_spec_fetcher.rb
+ (TestGemSpecFetcher#test_cache_dir_escapes_windows_paths): cache_dir
+ may have driveletter and `:' for base of cache_dir itself, so need
+ to skip it for checking.
+
Tue Mar 8 12:30:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb
index 57983a2752..20a40b68c1 100644
--- a/test/rubygems/test_gem_spec_fetcher.rb
+++ b/test/rubygems/test_gem_spec_fetcher.rb
@@ -415,7 +415,8 @@ class TestGemSpecFetcher < Gem::TestCase
def test_cache_dir_escapes_windows_paths
uri = URI.parse("file:///C:/WINDOWS/Temp/gem_repo")
cache_dir = @sf.cache_dir(uri)
- assert cache_dir !~ /:/, "#{cache_dir} should not contain a :"
+ pos = (/\A[a-z]:/i =~ cache_dir) ? 2 : 0
+ refute /:/ =~ cache_dir[pos..-1], "#{cache_dir} should not contain a :"
end
end